Refactored some of the token confusion.