Changes to meet style guide.

Some of the code didn't fit the style guide. Small fixes to comply