Please don't surround single conditionals with parenthesis (this happens multiple times in this PR)