2nd cleanup guideline style