Tokenizator. Draft
Some updates for tokenizator.
Refactoring.