Clean-up and update README.md.