Formatting and cleanup
Merge pull request #3 from gouravtiwari/master

Formatting and cleanup from prev project :smile: