code cleanup and optimizations
Merge branch 'master' of https://github.com/qcri-social/AIDR