Refactoring tokens