refactoring tokenizator