Update verbiage and TODO

* Update verbiage
* Update TODO