refactor variables
Merge pull request #50 from dimagi/tasks-update

refactor variables