Cleaning up Scripts a bit