Script Cleaning

Just some tidy up.