Improve style

Previously, there was no consistent (and generally accepted) style
applied to the code.  This change updates the code to be in compliance
with the styles set forth in the default settings of RubyMine.
Merge branch 'style'