More low risk code cleanups
Merge pull request #111 from joosthub/master

More low risk code cleanups. Thanks!