refactor token stream to remove floating promises