- Move doc comments to appropriate places.
- Add more comments