Coding style fixes
Merge pull request #3 from GrahamCampbell/master

Coding style fixes