Codestyle

This fixes issues #3, #4, and #2