Merge pull request #2 from pradpnayak/RG-108

fixed formatting and code clean up
-- fixed formatting and code clean up