Just cleaning up as I read, no behaviour changes
Merge pull request #43 from Jeffail/master

Mostly superficial changes