PIM-1439 : Normalizer refactoring