Add Normalize
Clean up