--HR-250 Code cleanup and indentation
--HR-250 minor change
Merge pull request #351 from PoonamNalawade/HR-250

--HR-250 Code cleanup and indentation