1. Committing changes on behalf of Manish
2. Formatting the code to some extent