fix bad import and minor cleanup
Merge pull request #1549 from dimagi/cz

fix bad import and minor cleanup