Improved tokenization demo