Refactoring token