clean up and refactor
Merge branch 'master' of https://github.com/julesbond007/owlpad