refactored tokens