Modernised the tokenizer