Clean up codebase
Merge branch 'master' of github.com:metapolator/metapolator