MrowNormalizer refactoring