Tidy up comments
Merge pull request #859 from tavva/master

Tidy up comments