Minor modification to standarize scripts