Corrected tokenizer
Removed unused regex