Improve run-script