* review fixes
* named functions
* some comments
* style issues