* minor cleanup
* comments