Code style changes
Fixes issue #2