Refactor tokens
update 1
Refactored Tokens