Fix token and formatting