Style consistency cleanup
Merge pull request #158 from vladikoff/style-clean-up

Style consistency cleanup