Token - simplify return