refactoring some tokens