Make tokens more readable, and use yield from instead for loop