Merge pull request #3 from pradpnayak/RG-108

-- fixed formatting and code clean up
-- fixed formatting for RG-108