Minor changes to conform to coding guide
Merge pull request #6 from Dr15Jones/conform

Minor changes to conform to coding guide