Tidied up the code under supervision.
Merge pull request #1 from pwcberry/master

Tidied up the code under supervision