Coding style fixes
Merge pull request #6 from mjrider/coding-style-fixes

Coding style fixes