Update README.md and clean-up code