Update linting rules

[j-rewerts]

There are currently 3 cases where our linter doesn't mind but I do:

1. else block on the closing bracket of the if.
2. single line if statements.
3. if statements with no brackets.

These need to be updated.