and cleaning up