Improve conditional style

Statements shouldn't be on a separate line from their conditionals without brackets.