Code cleanup
Update README.md