cleaning up, tightening up