Much needed bash cleanup