A little cleanup in gender