figure update and clean up