Improve code comment and style.

- Improve code comment and style
- TODO: readme update