Tokenizer simplified and allowing for better extensibility