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

Coding style fixes