Simplify the token serialization