PIM-1179 : cosmetic refactoring on flat product normalizer