- minor code cleanup
- more comments