Clean up normalize()