Code cleanup
Update documentation in README.md