Code Cleanup and updated Readme.md