Modularize a bit better by adding Tokenizer class