cleaned up the scripts; don't hate... and if you do, then just checkout the commit before this and undue all my cleanliness