Tiny bit more clean up of update