Merge pull request #12 from dimagi/cz

delete duplicately defined function (and commented function)
misc pep-8 stuff