major refactoring: code tidyup
Merge branch 'master' of https://github.com/mstn/Mappo