Attempt at making the code style more consistent.
Merge pull request #74 from nitrix/fixMinorStyling

Attempt at making the code style more consistent.