- some formatting
- improve comments