First review changes
- added comments
- improved layout