Tidying up in UpdateTask