Fix coding style
Merge pull request #136 from andig/code-cleanup

Fix coding style