clean up pt. 2