Styling, minor code changes
Merge pull request #1 from Danielovich/master

Stylechange