- add commenting
- fix formatting