Move from Normalizer to cleaner as it should be !