Clean up code
Merge pull request #489 from akeneo/refactoring_normalizer

Clean up code