Improve normalizator
Revert "Improve normalizator"

This reverts commit ecfba42643a00eb0fef2a24104cee0c519845fde.
Improving normalizator