Merge pull request #76 from pradpnayak/GEP-50

Gep 50
-- code cleanup and indentation, GEP-50