Cleanup setCXToken

* Correct comments
* Useful meaningful variable names

Change-Id: I1b5c2f99fcf2a4cdb6c3e3c12df5574129229636