tidying up, commenting
Merge branch 'dev' of https://github.com/championchap/Juice into dev