--code cleanup for CRM-12024
Merge pull request #83 from pradpnayak/CRM-12024

--code cleanup for CRM-12024