Cleaning up gender type