Cleanup
Consistent style
Merge pull request #16 from matthieua/cleanup

Cleanup