Optimization, with speed test
Make token handling a little more readable