Removed comment, refactored GenderAgreement