2nd round cleaning based on Harvey's feedback.