(maint) Style fix-ups
Merge pull request #33 from sschneid/style_fixups

(maint) Style fix-ups