--CIVI-6, code cleanup
Merge pull request #8 from pradpnayak/CIVI-6

--CIVI-6, code cleanup