Use "he/she" throughout rather than just the masculine pronoun.