improve token dump format