Clean up the scripts to make them more user friendly