Improved normalization