Made feature normalization more efficient