Improve Code Climate score.

Took care of some of the linting issues that came up, mostly
wrapping if statements in {} brackets.  Fairly nit-picky, I must
say haha.