cleaning up pt. 2