Kaa-278: fix PR review comments
Kaa-278: refactoring of token size constants