Tidy up the code.
Merge branch 'dev' of https://github.com/timlian/Telepathic into dev