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

Bunch of cosmetic changes
Fixed typo introduced in commit e8ed4c1f67d801ec842c502e69806262714c6e70.