Collection of small cleanups
Typofix
Merge pull request #1 from Nikerabbit/cleanups

Collection of small cleanups