Code cleanup
Merge branch 'master' of https://github.com/cat-labs/the-payback