Code cosmetics
Merge pull request #1 from joachimwe/master

Integrate cosmetics