Some style fixes
Merge pull request #70 from Bob131/master

Some style fixes