improve cleaning up