minor fixup

* add/update description comments
* rename variables to a more exact name