Code cleanups
Merge pull request #282 from hintjens/master

Code cleanups