Small improvements to normalize