Reduced indentation in tokenizer factory function
Refactoring to simply tokenizer factory
Finished simplification refactoring