- code cleanup
- comments