[refactor] Split up the normalization