code style fixes
Merge pull request #30 from fieg/cs-fixes

code style fixes