Improve normalization
Progress