Finish rewriting Normalization