Refactor token-methods

:checkered_flag: