Improve run scripts