Bunch of cosmetic changes
Merge pull request #426 from JohannesPfeifer/CosmeticChanges

Bunch of cosmetic changes