Refactor to improve structure of Validator
Refactor to move empty string to zero transformation part of the tokenizer