clean up and sort out