Some subjunctive conjugations, and some refactoring