[#788] Code cleanup
Merge pull request #789 from akvo/issue/788-cleanup

[#788] Code cleanup