Minor reformatting and refactoring
Update README.md