Rework update_copy
Clean up some variables