Update README.md, minor code cleanup