refactoring for new token rake commands