renamed the script and did some more cleanup