Add explicit GENDER support and remove unneeded indentation