- cleanup

- added some comments