Style guideline fixes
Merge pull request #66 from dalen/stylefixes

Style guideline fixes