cleaning up pt.3