Cleaning up the code
Updating README.md