Tidy the code.
Merge branch 'master' of github.com:Xorcerer/muto