Style

Proper code style
Fixes GH-48