style fixes
Merge pull request #17 from hypo/style-fix-take-2

style fixes