adding curly brackets to get rid of lint errors

@FredKSchott this should fix the curly brace lint errors. I saw a mix of styles on where to put `else` and `else if` and if the curly brace was kept in on the same line as the body or not. I used my best judgement, but am happy to change if others have problems with either style. Just want to get rid of those lint errors. :) 
@mikeal it looks like the rule is not flexible enough to do that.

Personally I'm in favor of always using braces because:
- the code reads easier that way (1-1 correspondence between conditional and indentation)
- it's pretty common that you need to add more lines to an existing statement

For really short stuff I tend to use immediate if instead.