Style fixes for next release

Updating style errors for upcomming release
Merge pull request #28 from grubernaut/style_fixes

Style fixes for next release