Clean up the script to make it 80 columns max