Update README.md file and general code cleanup