chore(client): Cleanup based on comments.

* Remove invalid comment
* Reorder functions to make review easier