Cleanup code.
Update README.md