Update README.md, clean up and code formatting