Big refactor on normalizer