Cleaning up and simplifying run-update.sh