Initial cleanup.
Merge pull request #1 from somya4c/feature/Cleanup

Thank you ;-)