Refactored normalizers and BaseNormalizer.