Refactor to use a normalizer