Improve README.md and comments