Updated token description
Simplified token parsing