Improve performance of normalization