style and quoting fixes
Merge pull request #3 from shoekstra/code_style_fixes

Code style fixes