Code Formatting and Various Other Changes.
Change filename
Remove old file
Merge pull request #3 from sunnyratilal/master

Changes and Code Formatting