Improve normalization