Improve the script