Refactor newToken()