Improve tokenizer and parser perfomance