Code tidy.
Merge branch 'master' of https://github.com/alistairrutherford/tonome.git