Move normalization into the container