Code cleanup and final notes in README.md