MC-126: Refactoring normalizer