Changed "if" statement formatting.

- Keep `else` on the same line as the braces.
- Force braces for if...else statements.