Lots of style
Merge pull request #3 from qbabin/style

Lots of style