Code clean-up.
Merge branch 'master' of https://github.com/baringji/matata-app