Refactoring normalizer