clean up and more work