diff --git a/env/HERA.env b/env/HERA.env
index 45dd1d5265..b3049c4032 100755
--- a/env/HERA.env
+++ b/env/HERA.env
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-if [ $# -ne 1 ]; then
+if [[ $# -ne 1 ]]; then
 
     echo "Must specify an input argument to set runtime environment variables!"
     echo "argument can be any one of the following:"
@@ -33,260 +33,260 @@ export NTHSTACK=1024000000
 ulimit -s unlimited
 ulimit -a
 
-export job=${PBS_JOBNAME:-$step}
+export job=${PBS_JOBNAME:-${step}}
 export jobid=${job}.${PBS_JOBID:-$$}
 
 
-if [ $step = "prep" -o $step = "prepbufr" ]; then
+if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_prep))
+    nth_max=$((npe_node_max / npe_node_prep))
 
     export POE="NO"
     export BACK="NO"
     export sys_tp="HERA"
     export launcher_PREP="srun"
 
-elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" -o $step = "wavepostbndpnt" -o $step = "wavepostbndpntbll" -o $step = "wavepostpnt" ]; then
+elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}" = "wavepostsbs" ]] || [[ "${step}" = "wavepostbndpnt" ]] || [[ "${step}" = "wavepostbndpntbll" ]] || [[ "${step}" = "wavepostpnt" ]]; then
 
     export CFP_MP="YES"
-    if [ $step = "waveprep" ]; then export MP_PULSE=0 ; fi
+    if [[ "${step}" = "waveprep" ]]; then export MP_PULSE=0 ; fi
     export wavempexec=${launcher}
     export wave_mpmd=${mpmd_opt}
 
-elif [ $step = "atmanalrun" ]; then
+elif [[ "${step}" = "atmanalrun" ]]; then
 
     export CFP_MP=${CFP_MP:-"YES"}
     export USE_CFP=${USE_CFP:-"YES"}
-    export APRUNCFP="$launcher -n \$ncmd ${mpmd_opt}"
+    export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
-    nth_max=$(($npe_node_max / $npe_node_atmanalrun))
+    nth_max=$((npe_node_max / npe_node_atmanalrun))
 
-    export NTHREADS_ATMANAL=${nth_atmanalrun:-$nth_max}
-    [[ $NTHREADS_ATMANAL -gt $nth_max ]] && export NTHREADS_ATMANAL=$nth_max
-    export APRUN_ATMANAL="$launcher -n $npe_atmanalrun"
+    export NTHREADS_ATMANAL=${nth_atmanalrun:-${nth_max}}
+    [[ ${NTHREADS_ATMANAL} -gt ${nth_max} ]] && export NTHREADS_ATMANAL=${nth_max}
+    export APRUN_ATMANAL="${launcher} -n ${npe_atmanalrun}"
 
-elif [ $step = "atmensanalrun" ]; then
+elif [[ "${step}" = "atmensanalrun" ]]; then
 
     export CFP_MP=${CFP_MP:-"YES"}
     export USE_CFP=${USE_CFP:-"YES"}
-    export APRUNCFP="$launcher -n \$ncmd ${mpmd_opt}"
+    export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
-    nth_max=$(($npe_node_max / $npe_node_atmensanalrun))
+    nth_max=$((npe_node_max / npe_node_atmensanalrun))
 
-    export NTHREADS_ATMENSANAL=${nth_atmensanalrun:-$nth_max}
-    [[ $NTHREADS_ATMENSANAL -gt $nth_max ]] && export NTHREADS_ATMENSANAL=$nth_max
-    export APRUN_ATMENSANAL="$launcher -n $npe_atmensanalrun"
+    export NTHREADS_ATMENSANAL=${nth_atmensanalrun:-${nth_max}}
+    [[ ${NTHREADS_ATMENSANAL} -gt ${nth_max} ]] && export NTHREADS_ATMENSANAL=${nth_max}
+    export APRUN_ATMENSANAL="${launcher} -n ${npe_atmensanalrun}"
 
-elif [ $step = "aeroanlrun" ]; then
+elif [[ "${step}" = "aeroanlrun" ]]; then
 
-    export APRUNCFP="$launcher -n \$ncmd ${mpmd_opt}"
+    export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
-    nth_max=$(($npe_node_max / $npe_node_aeroanlrun))
+    nth_max=$((npe_node_max / npe_node_aeroanlrun))
 
-    export NTHREADS_AEROANL=${nth_aeroanlrun:-$nth_max}
-    [[ $NTHREADS_AEROANL -gt $nth_max ]] && export NTHREADS_AEROANL=$nth_max
-    export APRUN_AEROANL="$launcher -n $npe_aeroanlrun"
+    export NTHREADS_AEROANL=${nth_aeroanlrun:-${nth_max}}
+    [[ ${NTHREADS_AEROANL} -gt ${nth_max} ]] && export NTHREADS_AEROANL=${nth_max}
+    export APRUN_AEROANL="${launcher} -n ${npe_aeroanlrun}"
 
-elif [ $step = "anal" -o $step = "analcalc" ]; then
+elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
 
     export MKL_NUM_THREADS=4
     export MKL_CBWR=AUTO
 
     export CFP_MP=${CFP_MP:-"YES"}
     export USE_CFP=${USE_CFP:-"YES"}
-    export APRUNCFP="$launcher -n \$ncmd ${mpmd_opt}"
+    export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
-    nth_max=$(($npe_node_max / $npe_node_anal))
+    nth_max=$((npe_node_max / npe_node_anal))
 
-    export NTHREADS_GSI=${nth_anal:-$nth_max}
-    [[ $NTHREADS_GSI -gt $nth_max ]] && export NTHREADS_GSI=$nth_max
-    export APRUN_GSI="$launcher -n ${npe_gsi:-$npe_anal}"
+    export NTHREADS_GSI=${nth_anal:-${nth_max}}
+    [[ ${NTHREADS_GSI} -gt ${nth_max} ]] && export NTHREADS_GSI=${nth_max}
+    export APRUN_GSI="${launcher} -n ${npe_gsi:-${npe_anal}}"
 
     export NTHREADS_CALCINC=${nth_calcinc:-1}
-    [[ $NTHREADS_CALCINC -gt $nth_max ]] && export NTHREADS_CALCINC=$nth_max
-    export APRUN_CALCINC="$launcher \$ncmd"
+    [[ ${NTHREADS_CALCINC} -gt ${nth_max} ]] && export NTHREADS_CALCINC=${nth_max}
+    export APRUN_CALCINC="${launcher} \$ncmd"
 
     export NTHREADS_CYCLE=${nth_cycle:-12}
-    [[ $NTHREADS_CYCLE -gt $npe_node_max ]] && export NTHREADS_CYCLE=$npe_node_max
+    [[ ${NTHREADS_CYCLE} -gt ${npe_node_max} ]] && export NTHREADS_CYCLE=${npe_node_max}
     npe_cycle=${ntiles:-6}
-    export APRUN_CYCLE="$launcher -n $npe_cycle"
+    export APRUN_CYCLE="${launcher} -n ${npe_cycle}"
 
 
     export NTHREADS_GAUSFCANL=1
     npe_gausfcanl=${npe_gausfcanl:-1}
-    export APRUN_GAUSFCANL="$launcher -n $npe_gausfcanl"
+    export APRUN_GAUSFCANL="${launcher} -n ${npe_gausfcanl}"
 
-elif [ $step = "sfcanl" ]; then
-    nth_max=$(($npe_node_max / $npe_node_sfcanl))
+elif [[ "${step}" = "sfcanl" ]]; then
+    nth_max=$((npe_node_max / npe_node_sfcanl))
 
     export NTHREADS_CYCLE=${nth_sfcanl:-14}
-    [[ $NTHREADS_CYCLE -gt $npe_node_max ]] && export NTHREADS_CYCLE=$npe_node_max
+    [[ ${NTHREADS_CYCLE} -gt ${npe_node_max} ]] && export NTHREADS_CYCLE=${npe_node_max}
     npe_sfcanl=${ntiles:-6}
-    export APRUN_CYCLE="$launcher -n $npe_sfcanl"
+    export APRUN_CYCLE="${launcher} -n ${npe_sfcanl}"
 
-elif [ $step = "gldas" ]; then
+elif [[ "${step}" = "gldas" ]]; then
 
     export USE_CFP="NO"
     export CFP_MP="YES"
 
-    nth_max=$(($npe_node_max / $npe_node_gldas))
+    nth_max=$((npe_node_max / npe_node_gldas))
 
-    export NTHREADS_GLDAS=${nth_gldas:-$nth_max}
-    [[ $NTHREADS_GLDAS -gt $nth_max ]] && export NTHREADS_GLDAS=$nth_max
-    export APRUN_GLDAS="$launcher -n $npe_gldas"
+    export NTHREADS_GLDAS=${nth_gldas:-${nth_max}}
+    [[ ${NTHREADS_GLDAS} -gt ${nth_max} ]] && export NTHREADS_GLDAS=${nth_max}
+    export APRUN_GLDAS="${launcher} -n ${npe_gldas}"
 
     export NTHREADS_GAUSSIAN=${nth_gaussian:-1}
-    [[ $NTHREADS_GAUSSIAN -gt $nth_max ]] && export NTHREADS_GAUSSIAN=$nth_max
-    export APRUN_GAUSSIAN="$launcher -n $npe_gaussian"
+    [[ ${NTHREADS_GAUSSIAN} -gt ${nth_max} ]] && export NTHREADS_GAUSSIAN=${nth_max}
+    export APRUN_GAUSSIAN="${launcher} -n ${npe_gaussian}"
 
 # Must run data processing with exactly the number of tasks as time
 # periods being processed.
 
-    npe_gldas_data_proc=$(($gldas_spinup_hours + 12))
-    export APRUN_GLDAS_DATA_PROC="$launcher -n $npe_gldas_data_proc ${mpmd_opt}"
+    npe_gldas_data_proc=$((gldas_spinup_hours + 12))
+    export APRUN_GLDAS_DATA_PROC="${launcher} -n ${npe_gldas_data_proc} ${mpmd_opt}"
 
-elif [ $step = "eobs" ]; then
+elif [[ "${step}" = "eobs" ]]; then
 
     export MKL_NUM_THREADS=4
     export MKL_CBWR=AUTO
 
-    nth_max=$(($npe_node_max / $npe_node_eobs))
+    nth_max=$((npe_node_max / npe_node_eobs))
 
-    export NTHREADS_GSI=${nth_eobs:-$nth_max}
-    [[ $NTHREADS_GSI -gt $nth_max ]] && export NTHREADS_GSI=$nth_max
-    export APRUN_GSI="$launcher -n ${npe_gsi:-$npe_eobs}"
+    export NTHREADS_GSI=${nth_eobs:-${nth_max}}
+    [[ ${NTHREADS_GSI} -gt ${nth_max} ]] && export NTHREADS_GSI=${nth_max}
+    export APRUN_GSI="${launcher} -n ${npe_gsi:-${npe_eobs}}"
 
     export CFP_MP=${CFP_MP:-"YES"}
     export USE_CFP=${USE_CFP:-"YES"}
-    export APRUNCFP="$launcher -n \$ncmd ${mpmd_opt}"
+    export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
-elif [ $step = "eupd" ]; then
+elif [[ "${step}" = "eupd" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_eupd))
+    nth_max=$((npe_node_max / npe_node_eupd))
 
-    export NTHREADS_ENKF=${nth_eupd:-$nth_max}
-    [[ $NTHREADS_ENKF -gt $nth_max ]] && export NTHREADS_ENKF=$nth_max
-    export APRUN_ENKF="$launcher -n ${npe_enkf:-$npe_eupd}"
+    export NTHREADS_ENKF=${nth_eupd:-${nth_max}}
+    [[ ${NTHREADS_ENKF} -gt ${nth_max} ]] && export NTHREADS_ENKF=${nth_max}
+    export APRUN_ENKF="${launcher} -n ${npe_enkf:-${npe_eupd}}"
 
     export CFP_MP=${CFP_MP:-"YES"}
     export USE_CFP=${USE_CFP:-"YES"}
-    export APRUNCFP="$launcher -n \$ncmd ${mpmd_opt}"
+    export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
-elif [ $step = "fcst" ]; then
+elif [[ "${step}" = "fcst" ]]; then
 
     #PEs and PEs/node can differ for GFS and GDAS forecasts if threading differs
-    if [[ $CDUMP == "gfs" ]]; then
-        npe_fcst=$npe_fcst_gfs
-        npe_node_fcst=$npe_node_fcst_gfs
-        nth_fv3=$nth_fv3_gfs
+    if [[ ${CDUMP} == "gfs" ]]; then
+        npe_fcst=${npe_fcst_gfs}
+        npe_node_fcst=${npe_node_fcst_gfs}
+        nth_fv3=${nth_fv3_gfs}
     fi
 
-    nth_max=$(($npe_node_max / $npe_node_fcst))
+    nth_max=$((npe_node_max / npe_node_fcst))
 
-    export NTHREADS_FV3=${nth_fv3:-$nth_max}
-    [[ $NTHREADS_FV3 -gt $nth_max ]] && export NTHREADS_FV3=$nth_max
-    export cores_per_node=$npe_node_max
-    export APRUN_FV3="$launcher -n $npe_fcst"
+    export NTHREADS_FV3=${nth_fv3:-${nth_max}}
+    [[ ${NTHREADS_FV3} -gt ${nth_max} ]] && export NTHREADS_FV3=${nth_max}
+    export cores_per_node=${npe_node_max}
+    export APRUN_FV3="${launcher} -n ${npe_fcst}"
 
     export NTHREADS_REGRID_NEMSIO=${nth_regrid_nemsio:-1}
-    [[ $NTHREADS_REGRID_NEMSIO -gt $nth_max ]] && export NTHREADS_REGRID_NEMSIO=$nth_max
-    export APRUN_REGRID_NEMSIO="$launcher -n ${LEVS}"
+    [[ ${NTHREADS_REGRID_NEMSIO} -gt ${nth_max} ]] && export NTHREADS_REGRID_NEMSIO=${nth_max}
+    export APRUN_REGRID_NEMSIO="${launcher} -n ${LEVS}"
 
     export NTHREADS_REMAP=${nth_remap:-2}
-    [[ $NTHREADS_REMAP -gt $nth_max ]] && export NTHREADS_REMAP=$nth_max
-    export APRUN_REMAP="$launcher -n ${npe_remap:-$npe_fcst}"
+    [[ ${NTHREADS_REMAP} -gt ${nth_max} ]] && export NTHREADS_REMAP=${nth_max}
+    export APRUN_REMAP="${launcher} -n ${npe_remap:-${npe_fcst}}"
     export I_MPI_DAPL_UD="enable"
 
-elif [ $step = "efcs" ]; then
+elif [[ "${step}" = "efcs" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_efcs))
+    nth_max=$((npe_node_max / npe_node_efcs))
 
-    export NTHREADS_FV3=${nth_efcs:-$nth_max}
-    [[ $NTHREADS_FV3 -gt $nth_max ]] && export NTHREADS_FV3=$nth_max
-    export cores_per_node=$npe_node_max
-    export APRUN_FV3="$launcher -n $npe_efcs"
+    export NTHREADS_FV3=${nth_efcs:-${nth_max}}
+    [[ ${NTHREADS_FV3} -gt ${nth_max} ]] && export NTHREADS_FV3=${nth_max}
+    export cores_per_node=${npe_node_max}
+    export APRUN_FV3="${launcher} -n ${npe_efcs}"
 
     export NTHREADS_REGRID_NEMSIO=${nth_regrid_nemsio:-1}
-    [[ $NTHREADS_REGRID_NEMSIO -gt $nth_max ]] && export NTHREADS_REGRID_NEMSIO=$nth_max
-    export APRUN_REGRID_NEMSIO="$launcher -n ${LEVS}"
+    [[ ${NTHREADS_REGRID_NEMSIO} -gt ${nth_max} ]] && export NTHREADS_REGRID_NEMSIO=${nth_max}
+    export APRUN_REGRID_NEMSIO="${launcher} -n ${LEVS}"
 
-elif [ $step = "post" ]; then
+elif [[ "${step}" = "post" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_post))
+    nth_max=$((npe_node_max / npe_node_post))
 
     export NTHREADS_NP=${nth_np:-1}
-    [[ $NTHREADS_NP -gt $nth_max ]] && export NTHREADS_NP=$nth_max
-    export APRUN_NP="$launcher -n ${npe_post}"
+    [[ ${NTHREADS_NP} -gt ${nth_max} ]] && export NTHREADS_NP=${nth_max}
+    export APRUN_NP="${launcher} -n ${npe_post}"
 
     export NTHREADS_DWN=${nth_dwn:-1}
-    [[ $NTHREADS_DWN -gt $nth_max ]] && export NTHREADS_DWN=$nth_max
-    export APRUN_DWN="$launcher -n ${npe_dwn}"
+    [[ ${NTHREADS_DWN} -gt ${nth_max} ]] && export NTHREADS_DWN=${nth_max}
+    export APRUN_DWN="${launcher} -n ${npe_dwn}"
 
-elif [ $step = "ecen" ]; then
+elif [[ "${step}" = "ecen" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_ecen))
+    nth_max=$((npe_node_max / npe_node_ecen))
 
-    export NTHREADS_ECEN=${nth_ecen:-$nth_max}
-    [[ $NTHREADS_ECEN -gt $nth_max ]] && export NTHREADS_ECEN=$nth_max
-    export APRUN_ECEN="$launcher -n ${npe_ecen}"
+    export NTHREADS_ECEN=${nth_ecen:-${nth_max}}
+    [[ ${NTHREADS_ECEN} -gt ${nth_max} ]] && export NTHREADS_ECEN=${nth_max}
+    export APRUN_ECEN="${launcher} -n ${npe_ecen}"
 
     export NTHREADS_CHGRES=${nth_chgres:-12}
-    [[ $NTHREADS_CHGRES -gt $npe_node_max ]] && export NTHREADS_CHGRES=$npe_node_max
+    [[ ${NTHREADS_CHGRES} -gt ${npe_node_max} ]] && export NTHREADS_CHGRES=${npe_node_max}
     export APRUN_CHGRES="time"
 
     export NTHREADS_CALCINC=${nth_calcinc:-1}
-    [[ $NTHREADS_CALCINC -gt $nth_max ]] && export NTHREADS_CALCINC=$nth_max
-    export APRUN_CALCINC="$launcher -n ${npe_ecen}"
+    [[ ${NTHREADS_CALCINC} -gt ${nth_max} ]] && export NTHREADS_CALCINC=${nth_max}
+    export APRUN_CALCINC="${launcher} -n ${npe_ecen}"
 
-elif [ $step = "esfc" ]; then
+elif [[ "${step}" = "esfc" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_esfc))
+    nth_max=$((npe_node_max / npe_node_esfc))
 
-    export NTHREADS_ESFC=${nth_esfc:-$nth_max}
-    [[ $NTHREADS_ESFC -gt $nth_max ]] && export NTHREADS_ESFC=$nth_max
-    export APRUN_ESFC="$launcher -n $npe_esfc"
+    export NTHREADS_ESFC=${nth_esfc:-${nth_max}}
+    [[ ${NTHREADS_ESFC} -gt ${nth_max} ]] && export NTHREADS_ESFC=${nth_max}
+    export APRUN_ESFC="${launcher} -n ${npe_esfc}"
 
     export NTHREADS_CYCLE=${nth_cycle:-14}
-    [[ $NTHREADS_CYCLE -gt $npe_node_max ]] && export NTHREADS_CYCLE=$npe_node_max
-    export APRUN_CYCLE="$launcher -n $npe_esfc"
+    [[ ${NTHREADS_CYCLE} -gt ${npe_node_max} ]] && export NTHREADS_CYCLE=${npe_node_max}
+    export APRUN_CYCLE="${launcher} -n ${npe_esfc}"
 
-elif [ $step = "epos" ]; then
+elif [[ "${step}" = "epos" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_epos))
+    nth_max=$((npe_node_max / npe_node_epos))
 
-    export NTHREADS_EPOS=${nth_epos:-$nth_max}
-    [[ $NTHREADS_EPOS -gt $nth_max ]] && export NTHREADS_EPOS=$nth_max
-    export APRUN_EPOS="$launcher -n $npe_epos"
+    export NTHREADS_EPOS=${nth_epos:-${nth_max}}
+    [[ ${NTHREADS_EPOS} -gt ${nth_max} ]] && export NTHREADS_EPOS=${nth_max}
+    export APRUN_EPOS="${launcher} -n ${npe_epos}"
 
-elif [ $step = "init" ]; then
+elif [[ "${step}" = "init" ]]; then
 
-    export APRUN="$launcher -n ${npe_init}"
+    export APRUN="${launcher} -n ${npe_init}"
 
-elif [ $step = "postsnd" ]; then
+elif [[ "${step}" = "postsnd" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_postsnd))
+    nth_max=$((npe_node_max / npe_node_postsnd))
 
     export NTHREADS_POSTSND=${nth_postsnd:-1}
-    [[ $NTHREADS_POSTSND -gt $nth_max ]] && export NTHREADS_POSTSND=$nth_max
-    export APRUN_POSTSND="$launcher -n ${npe_postsnd}"
+    [[ ${NTHREADS_POSTSND} -gt ${nth_max} ]] && export NTHREADS_POSTSND=${nth_max}
+    export APRUN_POSTSND="${launcher} -n ${npe_postsnd}"
 
     export NTHREADS_POSTSNDCFP=${nth_postsndcfp:-1}
-    [[ $NTHREADS_POSTSNDCFP -gt $nth_max ]] && export NTHREADS_POSTSNDCFP=$nth_max
-    export APRUN_POSTSNDCFP="$launcher -n ${npe_postsnd} ${mpmd_opt}"
+    [[ ${NTHREADS_POSTSNDCFP} -gt ${nth_max} ]] && export NTHREADS_POSTSNDCFP=${nth_max}
+    export APRUN_POSTSNDCFP="${launcher} -n ${npe_postsnd} ${mpmd_opt}"
 
-elif [ $step = "awips" ]; then
+elif [[ "${step}" = "awips" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_awips))
+    nth_max=$((npe_node_max / npe_node_awips))
 
     export NTHREADS_AWIPS=${nth_awips:-2}
-    [[ $NTHREADS_AWIPS -gt $nth_max ]] && export NTHREADS_AWIPS=$nth_max
-    export APRUN_AWIPSCFP="$launcher -n $npe_awips ${mpmd_opt}"
+    [[ ${NTHREADS_AWIPS} -gt ${nth_max} ]] && export NTHREADS_AWIPS=${nth_max}
+    export APRUN_AWIPSCFP="${launcher} -n ${npe_awips} ${mpmd_opt}"
 
-elif [ $step = "gempak" ]; then
+elif [[ "${step}" = "gempak" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_gempak))
+    nth_max=$((npe_node_max / npe_node_gempak))
 
     export NTHREADS_GEMPAK=${nth_gempak:-1}
-    [[ $NTHREADS_GEMPAK -gt ${nth_max} ]] && export NTHREADS_GEMPAK=${nth_max}
+    [[ ${NTHREADS_GEMPAK} -gt ${nth_max} ]] && export NTHREADS_GEMPAK=${nth_max}
     export APRUN="${launcher} -n ${npe_gempak} ${mpmd_opt}"
 fi
diff --git a/env/JET.env b/env/JET.env
index a5d3c7d1d2..19ab4b341a 100755
--- a/env/JET.env
+++ b/env/JET.env
@@ -1,6 +1,6 @@
 #!/bin/ksh -x
 
-if [ $# -ne 1 ]; then
+if [[ $# -ne 1 ]]; then
 
     echo "Must specify an input argument to set runtime environment variables!"
     echo "argument can be any one of the following:"
@@ -14,9 +14,9 @@ fi
 
 step=$1
 
-if [[ "$PARTITION_BATCH" = "xjet" ]]; then
+if [[ "${PARTITION_BATCH}" = "xjet" ]]; then
   export npe_node_max=24
-elif [[ "$PARTITION_BATCH" = "vjet" ]]; then
+elif [[ "${PARTITION_BATCH}" = "vjet" ]]; then
   export npe_node_max=16
 fi
 export launcher="srun -l --export=ALL"
@@ -29,205 +29,205 @@ export NTHSTACK=1024000000
 ulimit -s unlimited
 ulimit -a
 
-export job=${PBS_JOBNAME:-$step}
+export job=${PBS_JOBNAME:-${step}}
 export jobid=${job}.${PBS_JOBID:-$$}
 
-if [ $step = "prep" -o $step = "prepbufr" ]; then
+if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_prep))
+    nth_max=$((npe_node_max / npe_node_prep))
 
     export POE="NO"
     export BACK=${BACK:-"NO"}
     export sys_tp="JET"
 
-elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" -o $step = "wavepostbndpnt" -o $step = "wavepostbndpntbll" -o $step = "wavepostpnt" ]; then
+elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}" = "wavepostsbs" ]] || [[ "${step}" = "wavepostbndpnt" ]] || [[ "${step}" = "wavepostbndpntbll" ]] || [[ "${step}" = "wavepostpnt" ]]; then
 
-    if [ $step = "waveprep" ]; then export MP_PULSE=0 ; fi
+    if [[ "${step}" = "waveprep" ]]; then export MP_PULSE=0 ; fi
     export wavempexec=${launcher}
     export wave_mpmd=${mpmd_opt}
 
-elif [ $step = "atmanalrun" ]; then
+elif [[ "${step}" = "atmanalrun" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_atmanalrun))
+    nth_max=$((npe_node_max / npe_node_atmanalrun))
 
-    export NTHREADS_ATMANAL=${nth_atmanalrun:-$nth_max}
-    [[ $NTHREADS_ATMANAL -gt $nth_max ]] && export NTHREADS_ATMANAL=$nth_max
-    export APRUN_ATMANAL="$launcher $npe_atmanalrun"
+    export NTHREADS_ATMANAL=${nth_atmanalrun:-${nth_max}}
+    [[ ${NTHREADS_ATMANAL} -gt ${nth_max} ]] && export NTHREADS_ATMANAL=${nth_max}
+    export APRUN_ATMANAL="${launcher} ${npe_atmanalrun}"
 
-elif [ $step = "atmensanalrun" ]; then
+elif [[ "${step}" = "atmensanalrun" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_atmensanalrun))
+    nth_max=$((npe_node_max / npe_node_atmensanalrun))
 
-    export NTHREADS_ATMENSANAL=${nth_atmensanalrun:-$nth_max}
-    [[ $NTHREADS_ATMENSANAL -gt $nth_max ]] && export NTHREADS_ATMENSANAL=$nth_max
-    export APRUN_ATMENSANAL="$launcher $npe_atmensanalrun"
+    export NTHREADS_ATMENSANAL=${nth_atmensanalrun:-${nth_max}}
+    [[ ${NTHREADS_ATMENSANAL} -gt ${nth_max} ]] && export NTHREADS_ATMENSANAL=${nth_max}
+    export APRUN_ATMENSANAL="${launcher} ${npe_atmensanalrun}"
 
-elif [ $step = "anal" ]; then
+elif [[ "${step}" = "anal" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_anal))
+    nth_max=$((npe_node_max / npe_node_anal))
 
-    export NTHREADS_GSI=${nth_gsi:-$nth_max}
-    [[ $NTHREADS_GSI -gt $nth_max ]] && export NTHREADS_GSI=$nth_max
-    export APRUN_GSI="$launcher ${npe_gsi:-${npe_anal:-$PBS_NP}}"
+    export NTHREADS_GSI=${nth_gsi:-${nth_max}}
+    [[ ${NTHREADS_GSI} -gt ${nth_max} ]] && export NTHREADS_GSI=${nth_max}
+    export APRUN_GSI="${launcher} ${npe_gsi:-${npe_anal:-${PBS_NP}}}"
 
     export NTHREADS_CALCINC=${nth_calcinc:-1}
-    [[ $NTHREADS_CALCINC -gt $nth_max ]] && export NTHREADS_CALCINC=$nth_max
-    export APRUN_CALCINC="$launcher \$ncmd"
+    [[ ${NTHREADS_CALCINC} -gt ${nth_max} ]] && export NTHREADS_CALCINC=${nth_max}
+    export APRUN_CALCINC="${launcher} \$ncmd"
 
     export NTHREADS_CYCLE=${nth_cycle:-12}
-    [[ $NTHREADS_CYCLE -gt $npe_node_max ]] && export NTHREADS_CYCLE=$npe_node_max
+    [[ ${NTHREADS_CYCLE} -gt ${npe_node_max} ]] && export NTHREADS_CYCLE=${npe_node_max}
     npe_cycle=${ntiles:-6}
-    export APRUN_CYCLE="$launcher $npe_cycle"
+    export APRUN_CYCLE="${launcher} ${npe_cycle}"
 
     export NTHREADS_GAUSFCANL=1
     npe_gausfcanl=${npe_gausfcanl:-1}
-    export APRUN_GAUSFCANL="$launcher $npe_gausfcanl"
+    export APRUN_GAUSFCANL="${launcher} ${npe_gausfcanl}"
 
-elif [ $step = "sfcanl" ]; then
-    nth_max=$(($npe_node_max / $npe_node_sfcanl))
+elif [[ "${step}" = "sfcanl" ]]; then
+    nth_max=$((npe_node_max / npe_node_sfcanl))
 
     export NTHREADS_CYCLE=${nth_sfcanl:-14}
-    [[ $NTHREADS_CYCLE -gt $npe_node_max ]] && export NTHREADS_CYCLE=$npe_node_max
+    [[ ${NTHREADS_CYCLE} -gt ${npe_node_max} ]] && export NTHREADS_CYCLE=${npe_node_max}
     npe_sfcanl=${ntiles:-6}
-    export APRUN_CYCLE="$launcher $npe_sfcanl"
+    export APRUN_CYCLE="${launcher} ${npe_sfcanl}"
 
-elif [ $step = "gldas" ]; then
+elif [[ "${step}" = "gldas" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_gldas))
+    nth_max=$((npe_node_max / npe_node_gldas))
 
-    export NTHREADS_GLDAS=${nth_gldas:-$nth_max}
-    [[ $NTHREADS_GLDAS -gt $nth_max ]] && export NTHREADS_GLDAS=$nth_max
-    export APRUN_GLDAS="$launcher $npe_gldas"
+    export NTHREADS_GLDAS=${nth_gldas:-${nth_max}}
+    [[ ${NTHREADS_GLDAS} -gt ${nth_max} ]] && export NTHREADS_GLDAS=${nth_max}
+    export APRUN_GLDAS="${launcher} ${npe_gldas}"
 
     export NTHREADS_GAUSSIAN=${nth_gaussian:-1}
-    [[ $NTHREADS_GAUSSIAN -gt $nth_max ]] && export NTHREADS_GAUSSIAN=$nth_max
-    export APRUN_GAUSSIAN="$launcher $npe_gaussian"
+    [[ ${NTHREADS_GAUSSIAN} -gt ${nth_max} ]] && export NTHREADS_GAUSSIAN=${nth_max}
+    export APRUN_GAUSSIAN="${launcher} ${npe_gaussian}"
 
-elif [ $step = "eobs" ]; then
+elif [[ "${step}" = "eobs" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_eobs))
+    nth_max=$((npe_node_max / npe_node_eobs))
 
-    export NTHREADS_GSI=${nth_gsi:-$nth_max}
-    [[ $NTHREADS_GSI -gt $nth_max ]] && export NTHREADS_GSI=$nth_max
-    export APRUN_GSI="$launcher ${npe_gsi:-${npe_eobs:-$PBS_NP}}"
+    export NTHREADS_GSI=${nth_gsi:-${nth_max}}
+    [[ ${NTHREADS_GSI} -gt ${nth_max} ]] && export NTHREADS_GSI=${nth_max}
+    export APRUN_GSI="${launcher} ${npe_gsi:-${npe_eobs:-${PBS_NP}}}"
 
-elif [ $step = "eupd" ]; then
+elif [[ "${step}" = "eupd" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_eupd))
+    nth_max=$((npe_node_max / npe_node_eupd))
 
-    export NTHREADS_ENKF=${nth_enkf:-$nth_max}
-    [[ $NTHREADS_ENKF -gt $nth_max ]] && export NTHREADS_ENKF=$nth_max
-    export APRUN_ENKF="$launcher ${npe_enkf:-${npe_eupd:-$PBS_NP}}"
+    export NTHREADS_ENKF=${nth_enkf:-${nth_max}}
+    [[ ${NTHREADS_ENKF} -gt ${nth_max} ]] && export NTHREADS_ENKF=${nth_max}
+    export APRUN_ENKF="${launcher} ${npe_enkf:-${npe_eupd:-${PBS_NP}}}"
 
-elif [ $step = "fcst" ]; then
+elif [[ "${step}" = "fcst" ]]; then
 
     #PEs and PEs/node can differ for GFS and GDAS forecasts if threading differs
-    if [[ $CDUMP == "gfs" ]]; then
-        npe_fcst=$npe_fcst_gfs
-        npe_node_fcst=$npe_node_fcst_gfs
-        nth_fv3=$nth_fv3_gfs
+    if [[ ${CDUMP} == "gfs" ]]; then
+        npe_fcst=${npe_fcst_gfs}
+        npe_node_fcst=${npe_node_fcst_gfs}
+        nth_fv3=${nth_fv3_gfs}
     fi
 
-    nth_max=$(($npe_node_max / $npe_node_fcst))
+    nth_max=$((npe_node_max / npe_node_fcst))
 
-    export NTHREADS_FV3=${nth_fv3:-$nth_max}
-    [[ $NTHREADS_FV3 -gt $nth_max ]] && export NTHREADS_FV3=$nth_max
-    export cores_per_node=$npe_node_max
-    export APRUN_FV3="$launcher"
+    export NTHREADS_FV3=${nth_fv3:-${nth_max}}
+    [[ ${NTHREADS_FV3} -gt ${nth_max} ]] && export NTHREADS_FV3=${nth_max}
+    export cores_per_node=${npe_node_max}
+    export APRUN_FV3="${launcher}"
 
     export NTHREADS_REGRID_NEMSIO=${nth_regrid_nemsio:-1}
-    [[ $NTHREADS_REGRID_NEMSIO -gt $nth_max ]] && export NTHREADS_REGRID_NEMSIO=$nth_max
-    export APRUN_REGRID_NEMSIO="$launcher $LEVS"
+    [[ ${NTHREADS_REGRID_NEMSIO} -gt ${nth_max} ]] && export NTHREADS_REGRID_NEMSIO=${nth_max}
+    export APRUN_REGRID_NEMSIO="${launcher} ${LEVS}"
 
     export NTHREADS_REMAP=${nth_remap:-2}
-    [[ $NTHREADS_REMAP -gt $nth_max ]] && export NTHREADS_REMAP=$nth_max
-    export APRUN_REMAP="$launcher ${npe_remap:-${npe_fcst:-$PBS_NP}}"
+    [[ ${NTHREADS_REMAP} -gt ${nth_max} ]] && export NTHREADS_REMAP=${nth_max}
+    export APRUN_REMAP="${launcher} ${npe_remap:-${npe_fcst:-${PBS_NP}}}"
     export I_MPI_DAPL_UD="enable"
 
-elif [ $step = "efcs" ]; then
+elif [[ "${step}" = "efcs" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_efcs))
+    nth_max=$((npe_node_max / npe_node_efcs))
 
-    export NTHREADS_FV3=${nth_fv3:-$nth_max}
-    [[ $NTHREADS_FV3 -gt $nth_max ]] && export NTHREADS_FV3=$nth_max
-    export cores_per_node=$npe_node_max
-    export APRUN_FV3="$launcher ${npe_fv3:-${npe_efcs:-$PBS_NP}}"
+    export NTHREADS_FV3=${nth_fv3:-${nth_max}}
+    [[ ${NTHREADS_FV3} -gt ${nth_max} ]] && export NTHREADS_FV3=${nth_max}
+    export cores_per_node=${npe_node_max}
+    export APRUN_FV3="${launcher} ${npe_fv3:-${npe_efcs:-${PBS_NP}}}"
 
     export NTHREADS_REGRID_NEMSIO=${nth_regrid_nemsio:-1}
-    [[ $NTHREADS_REGRID_NEMSIO -gt $nth_max ]] && export NTHREADS_REGRID_NEMSIO=$nth_max
-    export APRUN_REGRID_NEMSIO="$launcher $LEVS"
+    [[ ${NTHREADS_REGRID_NEMSIO} -gt ${nth_max} ]] && export NTHREADS_REGRID_NEMSIO=${nth_max}
+    export APRUN_REGRID_NEMSIO="${launcher} ${LEVS}"
 
-elif [ $step = "post" ]; then
+elif [[ "${step}" = "post" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_post))
+    nth_max=$((npe_node_max / npe_node_post))
 
     export NTHREADS_NP=${nth_np:-1}
-    [[ $NTHREADS_NP -gt $nth_max ]] && export NTHREADS_NP=$nth_max
-    export APRUN_NP="$launcher"
+    [[ ${NTHREADS_NP} -gt ${nth_max} ]] && export NTHREADS_NP=${nth_max}
+    export APRUN_NP="${launcher}"
 
     export NTHREADS_DWN=${nth_dwn:-1}
-    [[ $NTHREADS_DWN -gt $nth_max ]] && export NTHREADS_DWN=$nth_max
-    export APRUN_NP="$launcher"
+    [[ ${NTHREADS_DWN} -gt ${nth_max} ]] && export NTHREADS_DWN=${nth_max}
+    export APRUN_NP="${launcher}"
 
-elif [ $step = "ecen" ]; then
+elif [[ "${step}" = "ecen" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_ecen))
+    nth_max=$((npe_node_max / npe_node_ecen))
 
-    export NTHREADS_ECEN=${nth_ecen:-$nth_max}
-    [[ $NTHREADS_ECEN -gt $nth_max ]] && export NTHREADS_ECEN=$nth_max
-    export APRUN_ECEN="$launcher ${npe_ecen:-$PBS_NP}"
+    export NTHREADS_ECEN=${nth_ecen:-${nth_max}}
+    [[ ${NTHREADS_ECEN} -gt ${nth_max} ]] && export NTHREADS_ECEN=${nth_max}
+    export APRUN_ECEN="${launcher} ${npe_ecen:-${PBS_NP}}"
 
     export NTHREADS_CHGRES=${nth_chgres:-12}
-    [[ $NTHREADS_CHGRES -gt $npe_node_max ]] && export NTHREADS_CHGRES=$npe_node_max
+    [[ ${NTHREADS_CHGRES} -gt ${npe_node_max} ]] && export NTHREADS_CHGRES=${npe_node_max}
     export APRUN_CHGRES="time"
 
     export NTHREADS_CALCINC=${nth_calcinc:-1}
-    [[ $NTHREADS_CALCINC -gt $nth_max ]] && export NTHREADS_CALCINC=$nth_max
-    export APRUN_CALCINC="$launcher ${npe_ecen:-$PBS_NP}"
+    [[ ${NTHREADS_CALCINC} -gt ${nth_max} ]] && export NTHREADS_CALCINC=${nth_max}
+    export APRUN_CALCINC="${launcher} ${npe_ecen:-${PBS_NP}}"
 
-elif [ $step = "esfc" ]; then
+elif [[ "${step}" = "esfc" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_esfc))
+    nth_max=$((npe_node_max / npe_node_esfc))
 
-    export NTHREADS_ESFC=${nth_esfc:-$nth_max}
-    [[ $NTHREADS_ESFC -gt $nth_max ]] && export NTHREADS_ESFC=$nth_max
-    export APRUN_ESFC="$launcher ${npe_esfc:-$PBS_NP}"
+    export NTHREADS_ESFC=${nth_esfc:-${nth_max}}
+    [[ ${NTHREADS_ESFC} -gt ${nth_max} ]] && export NTHREADS_ESFC=${nth_max}
+    export APRUN_ESFC="${launcher} ${npe_esfc:-${PBS_NP}}"
 
     export NTHREADS_CYCLE=${nth_cycle:-12}
-    [[ $NTHREADS_CYCLE -gt $npe_node_max ]] && export NTHREADS_CYCLE=$npe_node_max
-    export APRUN_CYCLE="$launcher $npe_esfc"
+    [[ ${NTHREADS_CYCLE} -gt ${npe_node_max} ]] && export NTHREADS_CYCLE=${npe_node_max}
+    export APRUN_CYCLE="${launcher} ${npe_esfc}"
 
 
-elif [ $step = "epos" ]; then
+elif [[ "${step}" = "epos" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_epos))
+    nth_max=$((npe_node_max / npe_node_epos))
 
-    export NTHREADS_EPOS=${nth_epos:-$nth_max}
-    [[ $NTHREADS_EPOS -gt $nth_max ]] && export NTHREADS_EPOS=$nth_max
-    export APRUN_EPOS="$launcher ${npe_epos:-$PBS_NP}"
+    export NTHREADS_EPOS=${nth_epos:-${nth_max}}
+    [[ ${NTHREADS_EPOS} -gt ${nth_max} ]] && export NTHREADS_EPOS=${nth_max}
+    export APRUN_EPOS="${launcher} ${npe_epos:-${PBS_NP}}"
 
-elif [ $step = "init" ]; then
+elif [[ "${step}" = "init" ]]; then
 
-    export APRUN="$launcher"
+    export APRUN="${launcher}"
 
-elif [ $step = "postsnd" ]; then
+elif [[ "${step}" = "postsnd" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_postsnd))
+    nth_max=$((npe_node_max / npe_node_postsnd))
 
     export NTHREADS_POSTSND=${nth_postsnd:-1}
-    [[ $NTHREADS_POSTSND -gt $nth_max ]] && export NTHREADS_POSTSND=$nth_max
-    export APRUN_POSTSND="$launcher $npe_postsnd"
+    [[ ${NTHREADS_POSTSND} -gt ${nth_max} ]] && export NTHREADS_POSTSND=${nth_max}
+    export APRUN_POSTSND="${launcher} ${npe_postsnd}"
 
     export NTHREADS_POSTSNDCFP=${nth_postsndcfp:-1}
-    [[ $NTHREADS_POSTSNDCFP -gt $nth_max ]] && export NTHREADS_POSTSNDCFP=$nth_max
-    export APRUN_POSTSNDCFP="$launcher $npe_postsndcfp"
+    [[ ${NTHREADS_POSTSNDCFP} -gt ${nth_max} ]] && export NTHREADS_POSTSNDCFP=${nth_max}
+    export APRUN_POSTSNDCFP="${launcher} ${npe_postsndcfp}"
 
-elif [ $step = "awips" ]; then
+elif [[ "${step}" = "awips" ]]; then
 
-     echo "WARNING: $step is not enabled on $machine!"
+     echo "WARNING: ${step} is not enabled on ${machine}!"
 
-elif [ $step = "gempak" ]; then
+elif [[ "${step}" = "gempak" ]]; then
 
-     echo "WARNING: $step is not enabled on $machine!"
+     echo "WARNING: ${step} is not enabled on ${machine}!"
 
 fi
diff --git a/env/ORION.env b/env/ORION.env
index d8bc5fc664..2ccbe271da 100755
--- a/env/ORION.env
+++ b/env/ORION.env
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-if [ $# -ne 1 ]; then
+if [[ $# -ne 1 ]]; then
 
     echo "Must specify an input argument to set runtime environment variables!"
     echo "argument can be any one of the following:"
@@ -33,255 +33,255 @@ export NTHSTACK=1024000000
 ulimit -s unlimited
 ulimit -a
 
-export job=${PBS_JOBNAME:-$step}
+export job=${PBS_JOBNAME:-${step}}
 export jobid=${job}.${PBS_JOBID:-$$}
 
-if [ $step = "prep" -o $step = "prepbufr" ]; then
+if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_prep))
+    nth_max=$((npe_node_max / npe_node_prep))
 
     export POE="NO"
     export BACK=${BACK:-"YES"}
     export sys_tp="ORION"
     export launcher_PREP="srun"
 
-elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" -o $step = "wavepostbndpnt" -o $step = "wavepostpnt" ]; then
+elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}" = "wavepostsbs" ]] || [[ "${step}" = "wavepostbndpnt" ]] || [[ "${step}" = "wavepostpnt" ]]; then
 
     export CFP_MP="YES"
-    if [ $step = "waveprep" ]; then export MP_PULSE=0 ; fi
+    if [[ "${step}" = "waveprep" ]]; then export MP_PULSE=0 ; fi
     export wavempexec=${launcher}
     export wave_mpmd=${mpmd_opt}
 
-elif [ $step = "atmanalrun" ]; then
+elif [[ "${step}" = "atmanalrun" ]]; then
 
     export CFP_MP=${CFP_MP:-"YES"}
     export USE_CFP=${USE_CFP:-"YES"}
-    export APRUNCFP="$launcher -n \$ncmd ${mpmd_opt}"
+    export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
-    nth_max=$(($npe_node_max / $npe_node_atmanalrun))
+    nth_max=$((npe_node_max / npe_node_atmanalrun))
 
-    export NTHREADS_ATMANAL=${nth_atmanalrun:-$nth_max}
-    [[ $NTHREADS_ATMANAL -gt $nth_max ]] && export NTHREADS_ATMANAL=$nth_max
-    export APRUN_ATMANAL="$launcher -n $npe_atmanalrun"
+    export NTHREADS_ATMANAL=${nth_atmanalrun:-${nth_max}}
+    [[ ${NTHREADS_ATMANAL} -gt ${nth_max} ]] && export NTHREADS_ATMANAL=${nth_max}
+    export APRUN_ATMANAL="${launcher} -n ${npe_atmanalrun}"
 
-elif [ $step = "atmensanalrun" ]; then
+elif [[ "${step}" = "atmensanalrun" ]]; then
 
     export CFP_MP=${CFP_MP:-"YES"}
     export USE_CFP=${USE_CFP:-"YES"}
-    export APRUNCFP="$launcher -n \$ncmd ${mpmd_opt}"
+    export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
-    nth_max=$(($npe_node_max / $npe_node_atmensanalrun))
+    nth_max=$((npe_node_max / npe_node_atmensanalrun))
 
-    export NTHREADS_ATMENSANAL=${nth_atmensanalrun:-$nth_max}
-    [[ $NTHREADS_ATMENSANAL -gt $nth_max ]] && export NTHREADS_ATMENSANAL=$nth_max
-    export APRUN_ATMENSANAL="$launcher -n $npe_atmensanalrun"
+    export NTHREADS_ATMENSANAL=${nth_atmensanalrun:-${nth_max}}
+    [[ ${NTHREADS_ATMENSANAL} -gt ${nth_max} ]] && export NTHREADS_ATMENSANAL=${nth_max}
+    export APRUN_ATMENSANAL="${launcher} -n ${npe_atmensanalrun}"
 
-elif [ $step = "aeroanlrun" ]; then
+elif [[ "${step}" = "aeroanlrun" ]]; then
 
-    export APRUNCFP="$launcher -n \$ncmd ${mpmd_opt}"
+    export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
-    nth_max=$(($npe_node_max / $npe_node_aeroanlrun))
+    nth_max=$((npe_node_max / npe_node_aeroanlrun))
 
-    export NTHREADS_AEROANL=${nth_aeroanlrun:-$nth_max}
-    [[ $NTHREADS_AEROANL -gt $nth_max ]] && export NTHREADS_AEROANL=$nth_max
-    export APRUN_AEROANL="$launcher -n $npe_aeroanlrun"
+    export NTHREADS_AEROANL=${nth_aeroanlrun:-${nth_max}}
+    [[ ${NTHREADS_AEROANL} -gt ${nth_max} ]] && export NTHREADS_AEROANL=${nth_max}
+    export APRUN_AEROANL="${launcher} -n ${npe_aeroanlrun}"
 
-elif [ $step = "anal" -o $step = "analcalc" ]; then
+elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
 
     export MKL_NUM_THREADS=4
     export MKL_CBWR=AUTO
 
     export CFP_MP=${CFP_MP:-"YES"}
     export USE_CFP=${USE_CFP:-"YES"}
-    export APRUNCFP="$launcher -n \$ncmd ${mpmd_opt}"
+    export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
-    nth_max=$(($npe_node_max / $npe_node_anal))
+    nth_max=$((npe_node_max / npe_node_anal))
 
-    export NTHREADS_GSI=${nth_anal:-$nth_max}
-    [[ $NTHREADS_GSI -gt $nth_max ]] && export NTHREADS_GSI=$nth_max
-    export APRUN_GSI="$launcher -n ${npe_gsi:-$npe_anal}"
+    export NTHREADS_GSI=${nth_anal:-${nth_max}}
+    [[ ${NTHREADS_GSI} -gt ${nth_max} ]] && export NTHREADS_GSI=${nth_max}
+    export APRUN_GSI="${launcher} -n ${npe_gsi:-${npe_anal}}"
 
     export NTHREADS_CALCINC=${nth_calcinc:-1}
-    [[ $NTHREADS_CALCINC -gt $nth_max ]] && export NTHREADS_CALCINC=$nth_max
-    export APRUN_CALCINC="$launcher \$ncmd"
+    [[ ${NTHREADS_CALCINC} -gt ${nth_max} ]] && export NTHREADS_CALCINC=${nth_max}
+    export APRUN_CALCINC="${launcher} \$ncmd"
 
     export NTHREADS_CYCLE=${nth_cycle:-12}
-    [[ $NTHREADS_CYCLE -gt $npe_node_max ]] && export NTHREADS_CYCLE=$npe_node_max
+    [[ ${NTHREADS_CYCLE} -gt ${npe_node_max} ]] && export NTHREADS_CYCLE=${npe_node_max}
     npe_cycle=${ntiles:-6}
-    export APRUN_CYCLE="$launcher -n $npe_cycle"
+    export APRUN_CYCLE="${launcher} -n ${npe_cycle}"
 
     export NTHREADS_GAUSFCANL=1
     npe_gausfcanl=${npe_gausfcanl:-1}
-    export APRUN_GAUSFCANL="$launcher -n $npe_gausfcanl"
+    export APRUN_GAUSFCANL="${launcher} -n ${npe_gausfcanl}"
 
-elif [ $step = "sfcanl" ]; then
-    nth_max=$(($npe_node_max / $npe_node_sfcanl))
+elif [[ "${step}" = "sfcanl" ]]; then
+    nth_max=$((npe_node_max / npe_node_sfcanl))
 
     export NTHREADS_CYCLE=${nth_sfcanl:-14}
-    [[ $NTHREADS_CYCLE -gt $npe_node_max ]] && export NTHREADS_CYCLE=$npe_node_max
+    [[ ${NTHREADS_CYCLE} -gt ${npe_node_max} ]] && export NTHREADS_CYCLE=${npe_node_max}
     npe_sfcanl=${ntiles:-6}
-    export APRUN_CYCLE="$launcher -n $npe_sfcanl"
+    export APRUN_CYCLE="${launcher} -n ${npe_sfcanl}"
 
-elif [ $step = "gldas" ]; then
+elif [[ "${step}" = "gldas" ]]; then
 
     export USE_CFP="NO"
 
-    nth_max=$(($npe_node_max / $npe_node_gldas))
+    nth_max=$((npe_node_max / npe_node_gldas))
 
-    export NTHREADS_GLDAS=${nth_gldas:-$nth_max}
-    [[ $NTHREADS_GLDAS -gt $nth_max ]] && export NTHREADS_GLDAS=$nth_max
-    export APRUN_GLDAS="$launcher -n $npe_gldas"
+    export NTHREADS_GLDAS=${nth_gldas:-${nth_max}}
+    [[ ${NTHREADS_GLDAS} -gt ${nth_max} ]] && export NTHREADS_GLDAS=${nth_max}
+    export APRUN_GLDAS="${launcher} -n ${npe_gldas}"
 
     export NTHREADS_GAUSSIAN=${nth_gaussian:-1}
-    [[ $NTHREADS_GAUSSIAN -gt $nth_max ]] && export NTHREADS_GAUSSIAN=$nth_max
-    export APRUN_GAUSSIAN="$launcher -n $npe_gaussian"
+    [[ ${NTHREADS_GAUSSIAN} -gt ${nth_max} ]] && export NTHREADS_GAUSSIAN=${nth_max}
+    export APRUN_GAUSSIAN="${launcher} -n ${npe_gaussian}"
 
 # Must run data processing with exactly the number of tasks as time
 # periods being processed.
 
-    npe_gldas_data_proc=$(($gldas_spinup_hours + 12))
-    export APRUN_GLDAS_DATA_PROC="$launcher -n $npe_gldas_data_proc ${mpmd_opt}"
+    npe_gldas_data_proc=$((gldas_spinup_hours + 12))
+    export APRUN_GLDAS_DATA_PROC="${launcher} -n ${npe_gldas_data_proc} ${mpmd_opt}"
 
-elif [ $step = "eobs" ]; then
+elif [[ "${step}" = "eobs" ]]; then
 
     export MKL_NUM_THREADS=4
     export MKL_CBWR=AUTO
 
     export CFP_MP=${CFP_MP:-"YES"}
     export USE_CFP=${USE_CFP:-"YES"}
-    export APRUNCFP="$launcher -n \$ncmd ${mpmd_opt}"
+    export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
-    nth_max=$(($npe_node_max / $npe_node_eobs))
+    nth_max=$((npe_node_max / npe_node_eobs))
 
-    export NTHREADS_GSI=${nth_eobs:-$nth_max}
-    [[ $NTHREADS_GSI -gt $nth_max ]] && export NTHREADS_GSI=$nth_max
-    export APRUN_GSI="$launcher -n ${npe_gsi:-$npe_eobs}"
+    export NTHREADS_GSI=${nth_eobs:-${nth_max}}
+    [[ ${NTHREADS_GSI} -gt ${nth_max} ]] && export NTHREADS_GSI=${nth_max}
+    export APRUN_GSI="${launcher} -n ${npe_gsi:-${npe_eobs}}"
 
-elif [ $step = "eupd" ]; then
+elif [[ "${step}" = "eupd" ]]; then
 
     export CFP_MP=${CFP_MP:-"YES"}
     export USE_CFP=${USE_CFP:-"YES"}
-    export APRUNCFP="$launcher -n \$ncmd ${mpmd_opt}"
+    export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
-    nth_max=$(($npe_node_max / $npe_node_eupd))
+    nth_max=$((npe_node_max / npe_node_eupd))
 
-    export NTHREADS_ENKF=${nth_eupd:-$nth_max}
-    [[ $NTHREADS_ENKF -gt $nth_max ]] && export NTHREADS_ENKF=$nth_max
-    export APRUN_ENKF="$launcher -n ${npe_enkf:-$npe_eupd}"
+    export NTHREADS_ENKF=${nth_eupd:-${nth_max}}
+    [[ ${NTHREADS_ENKF} -gt ${nth_max} ]] && export NTHREADS_ENKF=${nth_max}
+    export APRUN_ENKF="${launcher} -n ${npe_enkf:-${npe_eupd}}"
 
-elif [ $step = "fcst" ]; then
+elif [[ "${step}" = "fcst" ]]; then
 
     #PEs and PEs/node can differ for GFS and GDAS forecasts if threading differs
-    if [[ $CDUMP == "gfs" ]]; then
-        npe_fcst=$npe_fcst_gfs
-        npe_node_fcst=$npe_node_fcst_gfs
-        nth_fv3=$nth_fv3_gfs
+    if [[ ${CDUMP} == "gfs" ]]; then
+        npe_fcst=${npe_fcst_gfs}
+        npe_node_fcst=${npe_node_fcst_gfs}
+        nth_fv3=${nth_fv3_gfs}
     fi
 
-    nth_max=$(($npe_node_max / $npe_node_fcst))
+    nth_max=$((npe_node_max / npe_node_fcst))
 
-    export NTHREADS_FV3=${nth_fv3:-$nth_max}
-    [[ $NTHREADS_FV3 -gt $nth_max ]] && export NTHREADS_FV3=$nth_max
-    export cores_per_node=$npe_node_max
-    export APRUN_FV3="$launcher -n $npe_fcst"
+    export NTHREADS_FV3=${nth_fv3:-${nth_max}}
+    [[ ${NTHREADS_FV3} -gt ${nth_max} ]] && export NTHREADS_FV3=${nth_max}
+    export cores_per_node=${npe_node_max}
+    export APRUN_FV3="${launcher} -n ${npe_fcst}"
 
     export NTHREADS_REGRID_NEMSIO=${nth_regrid_nemsio:-1}
-    [[ $NTHREADS_REGRID_NEMSIO -gt $nth_max ]] && export NTHREADS_REGRID_NEMSIO=$nth_max
-    export APRUN_REGRID_NEMSIO="$launcher -n ${LEVS}"
+    [[ ${NTHREADS_REGRID_NEMSIO} -gt ${nth_max} ]] && export NTHREADS_REGRID_NEMSIO=${nth_max}
+    export APRUN_REGRID_NEMSIO="${launcher} -n ${LEVS}"
 
     export NTHREADS_REMAP=${nth_remap:-2}
-    [[ $NTHREADS_REMAP -gt $nth_max ]] && export NTHREADS_REMAP=$nth_max
-    export APRUN_REMAP="$launcher -n ${npe_remap:-$npe_fcst}"
+    [[ ${NTHREADS_REMAP} -gt ${nth_max} ]] && export NTHREADS_REMAP=${nth_max}
+    export APRUN_REMAP="${launcher} -n ${npe_remap:-${npe_fcst}}"
     export I_MPI_DAPL_UD="enable"
 
-elif [ $step = "efcs" ]; then
+elif [[ "${step}" = "efcs" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_efcs))
+    nth_max=$((npe_node_max / npe_node_efcs))
 
-    export NTHREADS_FV3=${nth_efcs:-$nth_max}
-    [[ $NTHREADS_FV3 -gt $nth_max ]] && export NTHREADS_FV3=$nth_max
-    export cores_per_node=$npe_node_max
-    export APRUN_FV3="$launcher -n $npe_efcs"
+    export NTHREADS_FV3=${nth_efcs:-${nth_max}}
+    [[ ${NTHREADS_FV3} -gt ${nth_max} ]] && export NTHREADS_FV3=${nth_max}
+    export cores_per_node=${npe_node_max}
+    export APRUN_FV3="${launcher} -n ${npe_efcs}"
 
     export NTHREADS_REGRID_NEMSIO=${nth_regrid_nemsio:-1}
-    [[ $NTHREADS_REGRID_NEMSIO -gt $nth_max ]] && export NTHREADS_REGRID_NEMSIO=$nth_max
-    export APRUN_REGRID_NEMSIO="$launcher -n ${LEVS}"
+    [[ ${NTHREADS_REGRID_NEMSIO} -gt ${nth_max} ]] && export NTHREADS_REGRID_NEMSIO=${nth_max}
+    export APRUN_REGRID_NEMSIO="${launcher} -n ${LEVS}"
 
-elif [ $step = "post" ]; then
+elif [[ "${step}" = "post" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_post))
+    nth_max=$((npe_node_max / npe_node_post))
 
     export NTHREADS_NP=${nth_np:-1}
-    [[ $NTHREADS_NP -gt $nth_max ]] && export NTHREADS_NP=$nth_max
-    export APRUN_NP="$launcher -n ${npe_post}"
+    [[ ${NTHREADS_NP} -gt ${nth_max} ]] && export NTHREADS_NP=${nth_max}
+    export APRUN_NP="${launcher} -n ${npe_post}"
 
     export NTHREADS_DWN=${nth_dwn:-1}
-    [[ $NTHREADS_DWN -gt $nth_max ]] && export NTHREADS_DWN=$nth_max
-    export APRUN_DWN="$launcher -n ${npe_dwn}"
+    [[ ${NTHREADS_DWN} -gt ${nth_max} ]] && export NTHREADS_DWN=${nth_max}
+    export APRUN_DWN="${launcher} -n ${npe_dwn}"
 
-elif [ $step = "ecen" ]; then
+elif [[ "${step}" = "ecen" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_ecen))
+    nth_max=$((npe_node_max / npe_node_ecen))
 
-    export NTHREADS_ECEN=${nth_ecen:-$nth_max}
-    [[ $NTHREADS_ECEN -gt $nth_max ]] && export NTHREADS_ECEN=$nth_max
-    export APRUN_ECEN="$launcher -n $npe_ecen"
+    export NTHREADS_ECEN=${nth_ecen:-${nth_max}}
+    [[ ${NTHREADS_ECEN} -gt ${nth_max} ]] && export NTHREADS_ECEN=${nth_max}
+    export APRUN_ECEN="${launcher} -n ${npe_ecen}"
 
     export NTHREADS_CHGRES=${nth_chgres:-12}
-    [[ $NTHREADS_CHGRES -gt $npe_node_max ]] && export NTHREADS_CHGRES=$npe_node_max
+    [[ ${NTHREADS_CHGRES} -gt ${npe_node_max} ]] && export NTHREADS_CHGRES=${npe_node_max}
     export APRUN_CHGRES="time"
 
     export NTHREADS_CALCINC=${nth_calcinc:-1}
-    [[ $NTHREADS_CALCINC -gt $nth_max ]] && export NTHREADS_CALCINC=$nth_max
-    export APRUN_CALCINC="$launcher -n $npe_ecen"
+    [[ ${NTHREADS_CALCINC} -gt ${nth_max} ]] && export NTHREADS_CALCINC=${nth_max}
+    export APRUN_CALCINC="${launcher} -n ${npe_ecen}"
 
-elif [ $step = "esfc" ]; then
+elif [[ "${step}" = "esfc" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_esfc))
+    nth_max=$((npe_node_max / npe_node_esfc))
 
-    export NTHREADS_ESFC=${nth_esfc:-$nth_max}
-    [[ $NTHREADS_ESFC -gt $nth_max ]] && export NTHREADS_ESFC=$nth_max
-    export APRUN_ESFC="$launcher -n $npe_esfc"
+    export NTHREADS_ESFC=${nth_esfc:-${nth_max}}
+    [[ ${NTHREADS_ESFC} -gt ${nth_max} ]] && export NTHREADS_ESFC=${nth_max}
+    export APRUN_ESFC="${launcher} -n ${npe_esfc}"
 
     export NTHREADS_CYCLE=${nth_cycle:-14}
-    [[ $NTHREADS_CYCLE -gt $npe_node_max ]] && export NTHREADS_CYCLE=$npe_node_max
-    export APRUN_CYCLE="$launcher -n $npe_esfc"
+    [[ ${NTHREADS_CYCLE} -gt ${npe_node_max} ]] && export NTHREADS_CYCLE=${npe_node_max}
+    export APRUN_CYCLE="${launcher} -n ${npe_esfc}"
 
-elif [ $step = "epos" ]; then
+elif [[ "${step}" = "epos" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_epos))
+    nth_max=$((npe_node_max / npe_node_epos))
 
-    export NTHREADS_EPOS=${nth_epos:-$nth_max}
-    [[ $NTHREADS_EPOS -gt $nth_max ]] && export NTHREADS_EPOS=$nth_max
-    export APRUN_EPOS="$launcher -n $npe_epos"
+    export NTHREADS_EPOS=${nth_epos:-${nth_max}}
+    [[ ${NTHREADS_EPOS} -gt ${nth_max} ]] && export NTHREADS_EPOS=${nth_max}
+    export APRUN_EPOS="${launcher} -n ${npe_epos}"
 
-elif [ $step = "init" ]; then
+elif [[ "${step}" = "init" ]]; then
 
-    export APRUN="$launcher -n ${npe_init}"
+    export APRUN="${launcher} -n ${npe_init}"
 
-elif [ $step = "postsnd" ]; then
+elif [[ "${step}" = "postsnd" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_postsnd))
+    nth_max=$((npe_node_max / npe_node_postsnd))
 
     export NTHREADS_POSTSND=${nth_postsnd:-1}
-    [[ $NTHREADS_POSTSND -gt $nth_max ]] && export NTHREADS_POSTSND=$nth_max
-    export APRUN_POSTSND="$launcher -n ${npe_postsnd}"
+    [[ ${NTHREADS_POSTSND} -gt ${nth_max} ]] && export NTHREADS_POSTSND=${nth_max}
+    export APRUN_POSTSND="${launcher} -n ${npe_postsnd}"
 
     export NTHREADS_POSTSNDCFP=${nth_postsndcfp:-1}
-    [[ $NTHREADS_POSTSNDCFP -gt $nth_max ]] && export NTHREADS_POSTSNDCFP=$nth_max
-    export APRUN_POSTSNDCFP="$launcher -n ${npe_postsnd} ${mpmd_opt}"
+    [[ ${NTHREADS_POSTSNDCFP} -gt ${nth_max} ]] && export NTHREADS_POSTSNDCFP=${nth_max}
+    export APRUN_POSTSNDCFP="${launcher} -n ${npe_postsnd} ${mpmd_opt}"
 
-elif [ $step = "awips" ]; then
+elif [[ "${step}" = "awips" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_awips))
+    nth_max=$((npe_node_max / npe_node_awips))
 
     export NTHREADS_AWIPS=${nth_awips:-2}
-    [[ $NTHREADS_AWIPS -gt $nth_max ]] && export NTHREADS_AWIPS=$nth_max
-    export APRUN_AWIPSCFP="$launcher -n $npe_awips ${mpmd_opt}"
+    [[ ${NTHREADS_AWIPS} -gt ${nth_max} ]] && export NTHREADS_AWIPS=${nth_max}
+    export APRUN_AWIPSCFP="${launcher} -n ${npe_awips} ${mpmd_opt}"
 
-elif [ $step = "gempak" ]; then
+elif [[ "${step}" = "gempak" ]]; then
 
-    nth_max=$(($npe_node_max / ${npe_node_gempak}))
+    nth_max=$((npe_node_max / npe_node_gempak))
 
     export NTHREADS_GEMPAK=${nth_gempak:-1}
     [[ ${NTHREADS_GEMPAK} -gt ${nth_max} ]] && export NTHREADS_GEMPAK=${nth_max}
diff --git a/env/S4.env b/env/S4.env
index 16b7df0825..125e98b0da 100755
--- a/env/S4.env
+++ b/env/S4.env
@@ -1,6 +1,6 @@
 #!/bin/bash -x
 
-if [ $# -ne 1 ]; then
+if [[ $# -ne 1 ]]; then
 
     echo "Must specify an input argument to set runtime environment variables!"
     echo "argument can be any one of the following:"
diff --git a/env/WCOSS2.env b/env/WCOSS2.env
index eb9969c429..079ed6bcfe 100755
--- a/env/WCOSS2.env
+++ b/env/WCOSS2.env
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-if [ $# -ne 1 ]; then
+if [[ $# -ne 1 ]]; then
 
     echo "Must specify an input argument to set runtime environment variables!"
     echo "argument can be any one of the following:"
@@ -21,159 +21,159 @@ export mpmd_opt="--cpu-bind verbose,core cfp"
 
 export npe_node_max=128
 
-export job=${PBS_JOBNAME:-$step}
+export job=${PBS_JOBNAME:-${step}}
 export jobid=${job}.${PBS_JOBID:-$$}
 
-if [ $step = "prep" -o $step = "prepbufr" ]; then
+if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_prep))
+    nth_max=$((npe_node_max / npe_node_prep))
 
     export POE=${POE:-"YES"}
     export BACK=${BACK:-"off"}
     export sys_tp="wcoss2"
     export launcher_PREP="mpiexec"
 
-elif [ $step = "waveinit" -o $step = "waveprep" -o $step = "wavepostsbs" -o $step = "wavepostbndpnt" -o $step = "wavepostbndpntbll"  -o $step = "wavepostpnt" ]; then
+elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}" = "wavepostsbs" ]] || [[ "${step}" = "wavepostbndpnt" ]] || [[ "${step}" = "wavepostbndpntbll"  ]] || [[ "${step}" = "wavepostpnt" ]]; then
 
-    if [ $step = "waveprep" -a $CDUMP = "gfs" ]; then NTASKS=$NTASKS_gfs ; fi
-    export wavempexec="$launcher -np"
+    if [[ "${step}" = "waveprep" ]] && [[ "${CDUMP}" = "gfs" ]]; then export NTASKS=${NTASKS_gfs} ; fi
+    export wavempexec="${launcher} -np"
     export wave_mpmd=${mpmd_opt}
 
-elif [ $step = "atmanalrun" ]; then
+elif [[ "${step}" = "atmanalrun" ]]; then
 
     export CFP_MP=${CFP_MP:-"YES"}
     export USE_CFP=${USE_CFP:-"YES"}
-    export APRUNCFP="$launcher -np \$ncmd ${mpmd_opt}"
+    export APRUNCFP="${launcher} -np \$ncmd ${mpmd_opt}"
 
-    nth_max=$(($npe_node_max / $npe_node_atmanalrun))
+    nth_max=$((npe_node_max / npe_node_atmanalrun))
 
-    export NTHREADS_ATMANAL=${nth_atmanalrun:-$nth_max}
-    [[ $NTHREADS_ATMANAL -gt $nth_max ]] && export NTHREADS_ATMANAL=$nth_max
-    export APRUN_ATMANAL="$launcher -n $npe_atmanalrun"
+    export NTHREADS_ATMANAL=${nth_atmanalrun:-${nth_max}}
+    [[ ${NTHREADS_ATMANAL} -gt ${nth_max} ]] && export NTHREADS_ATMANAL=${nth_max}
+    export APRUN_ATMANAL="${launcher} -n ${npe_atmanalrun}"
 
-elif [ $step = "atmensanalrun" ]; then
+elif [[ "${step}" = "atmensanalrun" ]]; then
 
     export CFP_MP=${CFP_MP:-"YES"}
     export USE_CFP=${USE_CFP:-"YES"}
-    export APRUNCFP="$launcher -np \$ncmd ${mpmd_opt}"
+    export APRUNCFP="${launcher} -np \$ncmd ${mpmd_opt}"
 
-    nth_max=$(($npe_node_max / $npe_node_atmensanalrun))
+    nth_max=$((npe_node_max / npe_node_atmensanalrun))
 
-    export NTHREADS_ATMENSANAL=${nth_atmensanalrun:-$nth_max}
-    [[ $NTHREADS_ATMENSANAL -gt $nth_max ]] && export NTHREADS_ATMENSANAL=$nth_max
-    export APRUN_ATMENSANAL="$launcher -n $npe_atmensanalrun"
+    export NTHREADS_ATMENSANAL=${nth_atmensanalrun:-${nth_max}}
+    [[ ${NTHREADS_ATMENSANAL} -gt ${nth_max} ]] && export NTHREADS_ATMENSANAL=${nth_max}
+    export APRUN_ATMENSANAL="${launcher} -n ${npe_atmensanalrun}"
 
-elif [ $step = "aeroanlrun" ]; then
+elif [[ "${step}" = "aeroanlrun" ]]; then
 
-    export APRUNCFP="$launcher -np \$ncmd ${mpmd_opt}"
+    export APRUNCFP="${launcher} -np \$ncmd ${mpmd_opt}"
 
-    nth_max=$(($npe_node_max / $npe_node_aeroanlrun))
+    nth_max=$((npe_node_max / npe_node_aeroanlrun))
 
-    export NTHREADS_AEROANL=${nth_aeroanlrun:-$nth_max}
-    [[ $NTHREADS_AEROANL -gt $nth_max ]] && export NTHREADS_AEROANL=$nth_max
-    export APRUN_AEROANL="$launcher -n $npe_aeroanlrun"
+    export NTHREADS_AEROANL=${nth_aeroanlrun:-${nth_max}}
+    [[ ${NTHREADS_AEROANL} -gt ${nth_max} ]] && export NTHREADS_AEROANL=${nth_max}
+    export APRUN_AEROANL="${launcher} -n ${npe_aeroanlrun}"
 
-elif [ $step = "anal" -o $step = "analcalc" ]; then
+elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
 
     export OMP_PLACES=cores
     export OMP_STACKSIZE=1G
     export FI_OFI_RXM_SAR_LIMIT=3145728
 
-    if [ $step = "analcalc" ]; then
+    if [[ "${step}" = "analcalc" ]]; then
       export MPICH_MPIIO_HINTS="*:romio_cb_write=disable"
     fi
 
-    nth_max=$(($npe_node_max / $npe_node_anal))
+    nth_max=$((npe_node_max / npe_node_anal))
 
-    export NTHREADS_GSI=${nth_anal:-$nth_max}
-    [[ $NTHREADS_GSI -gt $nth_max ]] && export NTHREADS_GSI=$nth_max
-    export APRUN_GSI="$launcher -n ${npe_gsi:-$npe_anal} -ppn $npe_node_anal --cpu-bind depth --depth $NTHREADS_GSI"
+    export NTHREADS_GSI=${nth_anal:-${nth_max}}
+    [[ ${NTHREADS_GSI} -gt ${nth_max} ]] && export NTHREADS_GSI=${nth_max}
+    export APRUN_GSI="${launcher} -n ${npe_gsi:-${npe_anal}} -ppn ${npe_node_anal} --cpu-bind depth --depth ${NTHREADS_GSI}"
 
     export NTHREADS_CALCINC=${nth_calcinc:-1}
-    [[ $NTHREADS_CALCINC -gt $nth_max ]] && export NTHREADS_CALCINC=$nth_max
-    export APRUN_CALCINC="$launcher \$ncmd"
+    [[ ${NTHREADS_CALCINC} -gt ${nth_max} ]] && export NTHREADS_CALCINC=${nth_max}
+    export APRUN_CALCINC="${launcher} \$ncmd"
 
     export NTHREADS_CYCLE=${nth_cycle:-14}
-    [[ $NTHREADS_CYCLE -gt $npe_node_max ]] && export NTHREADS_CYCLE=$npe_node_max
+    [[ ${NTHREADS_CYCLE} -gt ${npe_node_max} ]] && export NTHREADS_CYCLE=${npe_node_max}
     npe_cycle=${ntiles:-6}
-    export APRUN_CYCLE="$launcher -n $npe_cycle -ppn $npe_node_cycle --cpu-bind depth --depth $NTHREADS_CYCLE"
+    export APRUN_CYCLE="${launcher} -n ${npe_cycle} -ppn ${npe_node_cycle} --cpu-bind depth --depth ${NTHREADS_CYCLE}"
 
     export NTHREADS_GAUSFCANL=1
     npe_gausfcanl=${npe_gausfcanl:-1}
-    export APRUN_GAUSFCANL="$launcher -n $npe_gausfcanl"
+    export APRUN_GAUSFCANL="${launcher} -n ${npe_gausfcanl}"
 
     export NTHREADS_CHGRES=${nth_echgres:-14}
-    [[ $NTHREADS_CHGRES -gt $npe_node_max ]] && export NTHREADS_CHGRES=$npe_node_max
+    [[ ${NTHREADS_CHGRES} -gt ${npe_node_max} ]] && export NTHREADS_CHGRES=${npe_node_max}
     export APRUN_CHGRES=""
 
     export CFP_MP=${CFP_MP:-"NO"}
     export USE_CFP=${USE_CFP:-"YES"}
-    export APRUNCFP="$launcher -np \$ncmd ${mpmd_opt}"
+    export APRUNCFP="${launcher} -np \$ncmd ${mpmd_opt}"
 
-elif [ $step = "sfcanl" ]; then
+elif [[ "${step}" = "sfcanl" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_sfcanl))
+    nth_max=$((npe_node_max / npe_node_sfcanl))
 
     export NTHREADS_CYCLE=${nth_sfcanl:-14}
-    [[ $NTHREADS_CYCLE -gt $npe_node_max ]] && export NTHREADS_CYCLE=$npe_node_max
+    [[ ${NTHREADS_CYCLE} -gt ${npe_node_max} ]] && export NTHREADS_CYCLE=${npe_node_max}
     npe_sfcanl=${ntiles:-6}
-    export APRUN_CYCLE="$launcher -n $npe_sfcanl"
+    export APRUN_CYCLE="${launcher} -n ${npe_sfcanl}"
 
-elif [ $step = "gldas" ]; then
+elif [[ "${step}" = "gldas" ]]; then
 
     export USE_CFP="YES"
     export CFP_MP="NO"
 
-    nth_max=$(($npe_node_max / $npe_node_gldas))
+    nth_max=$((npe_node_max / npe_node_gldas))
 
-    export NTHREADS_GLDAS=${nth_gldas:-$nth_max}
-    [[ $NTHREADS_GLDAS -gt $nth_max ]] && export NTHREADS_GLDAS=$nth_max
-    export APRUN_GLDAS="$launcher -n $npe_gldas -ppn $npe_node_gldas --cpu-bind depth --depth $NTHREADS_GLDAS"
+    export NTHREADS_GLDAS=${nth_gldas:-${nth_max}}
+    [[ ${NTHREADS_GLDAS} -gt ${nth_max} ]] && export NTHREADS_GLDAS=${nth_max}
+    export APRUN_GLDAS="${launcher} -n ${npe_gldas} -ppn ${npe_node_gldas} --cpu-bind depth --depth ${NTHREADS_GLDAS}"
 
     export NTHREADS_GAUSSIAN=${nth_gaussian:-1}
-    [[ $NTHREADS_GAUSSIAN -gt $nth_max ]] && export NTHREADS_GAUSSIAN=$nth_max
-    export APRUN_GAUSSIAN="$launcher -n $npe_gaussian -ppn $npe_node_gaussian --cpu-bind depth --depth $NTHREADS_GAUSSIAN"
+    [[ ${NTHREADS_GAUSSIAN} -gt ${nth_max} ]] && export NTHREADS_GAUSSIAN=${nth_max}
+    export APRUN_GAUSSIAN="${launcher} -n ${npe_gaussian} -ppn ${npe_node_gaussian} --cpu-bind depth --depth ${NTHREADS_GAUSSIAN}"
 
     # Must run data processing with exactly the number of tasks as time
     # periods being processed.
     export USE_CFP=${USE_CFP:-"YES"}
-    npe_gldas_data_proc=$(($gldas_spinup_hours + 12))
-    export APRUN_GLDAS_DATA_PROC="$launcher -np $npe_gldas_data_proc ${mpmd_opt}"
+    npe_gldas_data_proc=$((gldas_spinup_hours + 12))
+    export APRUN_GLDAS_DATA_PROC="${launcher} -np ${npe_gldas_data_proc} ${mpmd_opt}"
 
-elif [ $step = "eobs" ]; then
+elif [[ "${step}" = "eobs" ]]; then
 
     export OMP_PLACES=cores
     export OMP_STACKSIZE=1G
     export FI_OFI_RXM_SAR_LIMIT=3145728
 
-    nth_max=$(($npe_node_max / $npe_node_eobs))
+    nth_max=$((npe_node_max / npe_node_eobs))
 
-    export NTHREADS_GSI=${nth_eobs:-$nth_max}
-    [[ $NTHREADS_GSI -gt $nth_max ]] && export NTHREADS_GSI=$nth_max
-    export APRUN_GSI="$launcher -n ${npe_gsi:-$npe_eobs} -ppn $npe_node_eobs --cpu-bind depth --depth $NTHREADS_GSI"
+    export NTHREADS_GSI=${nth_eobs:-${nth_max}}
+    [[ ${NTHREADS_GSI} -gt ${nth_max} ]] && export NTHREADS_GSI=${nth_max}
+    export APRUN_GSI="${launcher} -n ${npe_gsi:-${npe_eobs}} -ppn ${npe_node_eobs} --cpu-bind depth --depth ${NTHREADS_GSI}"
 
     export CFP_MP=${CFP_MP:-"NO"}
     export USE_CFP=${USE_CFP:-"YES"}
-    export APRUNCFP="$launcher -np \$ncmd ${mpmd_opt}"
+    export APRUNCFP="${launcher} -np \$ncmd ${mpmd_opt}"
 
-elif [ $step = "eupd" ]; then
+elif [[ "${step}" = "eupd" ]]; then
 
     export OMP_PLACES=cores
     export OMP_STACKSIZE=2G
     export MPICH_COLL_OPT_OFF=1
     export FI_OFI_RXM_SAR_LIMIT=3145728
 
-    nth_max=$(($npe_node_max / $npe_node_eupd))
+    nth_max=$((npe_node_max / npe_node_eupd))
 
-    export NTHREADS_ENKF=${nth_eupd:-$nth_max}
-    [[ $NTHREADS_ENKF -gt $nth_max ]] && export NTHREADS_ENKF=$nth_max
-    export APRUN_ENKF="$launcher -n ${npe_enkf:-$npe_eupd} -ppn $npe_node_eupd --cpu-bind depth --depth $NTHREADS_ENKF"
+    export NTHREADS_ENKF=${nth_eupd:-${nth_max}}
+    [[ ${NTHREADS_ENKF} -gt ${nth_max} ]] && export NTHREADS_ENKF=${nth_max}
+    export APRUN_ENKF="${launcher} -n ${npe_enkf:-${npe_eupd}} -ppn ${npe_node_eupd} --cpu-bind depth --depth ${NTHREADS_ENKF}"
 
     export CFP_MP=${CFP_MP:-"NO"}
     export USE_CFP=${USE_CFP:-"YES"}
-    export APRUNCFP="$launcher -np \$ncmd ${mpmd_opt}"
+    export APRUNCFP="${launcher} -np \$ncmd ${mpmd_opt}"
 
-elif [ $step = "fcst" ]; then
+elif [[ "${step}" = "fcst" ]]; then
 
     export OMP_PLACES=cores
     export OMP_STACKSIZE=2048M
@@ -181,138 +181,138 @@ elif [ $step = "fcst" ]; then
     export FI_OFI_RXM_TX_SIZE=40000
 
     #PEs and PEs/node can differ for GFS and GDAS forecasts if threading differs
-    if [[ $CDUMP == "gfs" ]]; then
-        npe_fcst=$npe_fcst_gfs
-        npe_node_fcst=$npe_node_fcst_gfs
-        nth_fv3=$nth_fv3_gfs
+    if [[ ${CDUMP} == "gfs" ]]; then
+        npe_fcst=${npe_fcst_gfs}
+        npe_node_fcst=${npe_node_fcst_gfs}
+        nth_fv3=${nth_fv3_gfs}
     fi
 
-    nth_max=$(($npe_node_max / $npe_node_fcst))
+    nth_max=$((npe_node_max / npe_node_fcst))
 
-    export NTHREADS_FV3=${nth_fv3:-$nth_max}
-    [[ $NTHREADS_FV3 -gt $nth_max ]] && export NTHREADS_FV3=$nth_max
-    export cores_per_node=$npe_node_max
-    export APRUN_FV3="$launcher -n $npe_fcst -ppn $npe_node_fcst --cpu-bind depth --depth $NTHREADS_FV3"
+    export NTHREADS_FV3=${nth_fv3:-${nth_max}}
+    [[ ${NTHREADS_FV3} -gt ${nth_max} ]] && export NTHREADS_FV3=${nth_max}
+    export cores_per_node=${npe_node_max}
+    export APRUN_FV3="${launcher} -n ${npe_fcst} -ppn ${npe_node_fcst} --cpu-bind depth --depth ${NTHREADS_FV3}"
 
     export NTHREADS_REGRID_NEMSIO=${nth_regrid_nemsio:-1}
-    [[ $NTHREADS_REGRID_NEMSIO -gt $nth_max ]] && export NTHREADS_REGRID_NEMSIO=$nth_max
-    export APRUN_REGRID_NEMSIO="$launcher -n $LEVS"
+    [[ ${NTHREADS_REGRID_NEMSIO} -gt ${nth_max} ]] && export NTHREADS_REGRID_NEMSIO=${nth_max}
+    export APRUN_REGRID_NEMSIO="${launcher} -n ${LEVS}"
 
     export NTHREADS_REMAP=${nth_remap:-2}
-    [[ $NTHREADS_REMAP -gt $nth_max ]] && export NTHREADS_REMAP=$nth_max
-    export APRUN_REMAP="$launcher -n ${npe_remap:-$npe_fcst}"
+    [[ ${NTHREADS_REMAP} -gt ${nth_max} ]] && export NTHREADS_REMAP=${nth_max}
+    export APRUN_REMAP="${launcher} -n ${npe_remap:-${npe_fcst}}"
     export I_MPI_DAPL_UD="enable"
 
-elif [ $step = "efcs" ]; then
+elif [[ "${step}" = "efcs" ]]; then
 
     export MPICH_MPIIO_HINTS="*:romio_cb_write=disable"
     export FI_OFI_RXM_SAR_LIMIT=3145728
     export FI_OFI_RXM_RX_SIZE=40000
     export FI_OFI_RXM_TX_SIZE=40000
 
-    nth_max=$(($npe_node_max / $npe_node_efcs))
+    nth_max=$((npe_node_max / npe_node_efcs))
 
-    export NTHREADS_FV3=${nth_efcs:-$nth_max}
-    [[ $NTHREADS_FV3 -gt $nth_max ]] && export NTHREADS_FV3=$nth_max
-    export cores_per_node=$npe_node_max
-    export APRUN_FV3="$launcher -n ${npe_fv3:-$npe_efcs} -ppn $npe_node_efcs --cpu-bind depth --depth $NTHREADS_FV3"
+    export NTHREADS_FV3=${nth_efcs:-${nth_max}}
+    [[ ${NTHREADS_FV3} -gt ${nth_max} ]] && export NTHREADS_FV3=${nth_max}
+    export cores_per_node=${npe_node_max}
+    export APRUN_FV3="${launcher} -n ${npe_fv3:-${npe_efcs}} -ppn ${npe_node_efcs} --cpu-bind depth --depth ${NTHREADS_FV3}"
 
     export NTHREADS_REGRID_NEMSIO=${nth_regrid_nemsio:-1}
-    [[ $NTHREADS_REGRID_NEMSIO -gt $nth_max ]] && export NTHREADS_REGRID_NEMSIO=$nth_max
-    export APRUN_REGRID_NEMSIO="$launcher -n $LEVS"
+    [[ ${NTHREADS_REGRID_NEMSIO} -gt ${nth_max} ]] && export NTHREADS_REGRID_NEMSIO=${nth_max}
+    export APRUN_REGRID_NEMSIO="${launcher} -n ${LEVS}"
 
-elif [ $step = "post" ]; then
+elif [[ "${step}" = "post" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_post))
+    nth_max=$((npe_node_max / npe_node_post))
 
     export NTHREADS_NP=${nth_np:-1}
-    [[ $NTHREADS_NP -gt $nth_max ]] && export NTHREADS_NP=$nth_max
-    export APRUN_NP="$launcher -n ${npe_np:-$npe_post} -ppn $npe_node_post --cpu-bind depth --depth $NTHREADS_NP"
+    [[ ${NTHREADS_NP} -gt ${nth_max} ]] && export NTHREADS_NP=${nth_max}
+    export APRUN_NP="${launcher} -n ${npe_np:-${npe_post}} -ppn ${npe_node_post} --cpu-bind depth --depth ${NTHREADS_NP}"
 
     export NTHREADS_DWN=${nth_dwn:-1}
-    [[ $NTHREADS_DWN -gt $nth_max ]] && export NTHREADS_DWN=$nth_max
-    export APRUN_DWN="$launcher -np $npe_dwn ${mpmd_opt}"
+    [[ ${NTHREADS_DWN} -gt ${nth_max} ]] && export NTHREADS_DWN=${nth_max}
+    export APRUN_DWN="${launcher} -np ${npe_dwn} ${mpmd_opt}"
 
-elif [ $step = "ecen" ]; then
+elif [[ "${step}" = "ecen" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_ecen))
+    nth_max=$((npe_node_max / npe_node_ecen))
 
-    export NTHREADS_ECEN=${nth_ecen:-$nth_max}
-    [[ $NTHREADS_ECEN -gt $nth_max ]] && export NTHREADS_ECEN=$nth_max
-    export APRUN_ECEN="$launcher -n $npe_ecen -ppn $npe_node_ecen --cpu-bind depth --depth $NTHREADS_ECEN"
+    export NTHREADS_ECEN=${nth_ecen:-${nth_max}}
+    [[ ${NTHREADS_ECEN} -gt ${nth_max} ]] && export NTHREADS_ECEN=${nth_max}
+    export APRUN_ECEN="${launcher} -n ${npe_ecen} -ppn ${npe_node_ecen} --cpu-bind depth --depth ${NTHREADS_ECEN}"
 
     export NTHREADS_CHGRES=${nth_chgres:-14}
-    [[ $NTHREADS_CHGRES -gt $npe_node_max ]] && export NTHREADS_CHGRES=$npe_node_max
+    [[ ${NTHREADS_CHGRES} -gt ${npe_node_max} ]] && export NTHREADS_CHGRES=${npe_node_max}
     export APRUN_CHGRES="time"
 
     export NTHREADS_CALCINC=${nth_calcinc:-1}
-    [[ $NTHREADS_CALCINC -gt $nth_max ]] && export NTHREADS_CALCINC=$nth_max
-    export APRUN_CALCINC="$launcher -n $npe_ecen"
+    [[ ${NTHREADS_CALCINC} -gt ${nth_max} ]] && export NTHREADS_CALCINC=${nth_max}
+    export APRUN_CALCINC="${launcher} -n ${npe_ecen}"
 
     export NTHREADS_CYCLE=${nth_cycle:-14}
-    [[ $NTHREADS_CYCLE -gt $npe_node_max ]] && export NTHREADS_CYCLE=$npe_node_max
-    export APRUN_CYCLE="$launcher -n $npe_ecen -ppn $npe_node_cycle --cpu-bind depth --depth $NTHREADS_CYCLE"
+    [[ ${NTHREADS_CYCLE} -gt ${npe_node_max} ]] && export NTHREADS_CYCLE=${npe_node_max}
+    export APRUN_CYCLE="${launcher} -n ${npe_ecen} -ppn ${npe_node_cycle} --cpu-bind depth --depth ${NTHREADS_CYCLE}"
 
-elif [ $step = "esfc" ]; then
+elif [[ "${step}" = "esfc" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_esfc))
+    nth_max=$((npe_node_max / npe_node_esfc))
 
-    export NTHREADS_ESFC=${nth_esfc:-$nth_max}
-    [[ $NTHREADS_ESFC -gt $nth_max ]] && export NTHREADS_ESFC=$nth_max
-    export APRUN_ESFC="$launcher -n $npe_esfc -ppn $npe_node_esfc --cpu-bind depth --depth $NTHREADS_ESFC"
+    export NTHREADS_ESFC=${nth_esfc:-${nth_max}}
+    [[ ${NTHREADS_ESFC} -gt ${nth_max} ]] && export NTHREADS_ESFC=${nth_max}
+    export APRUN_ESFC="${launcher} -n ${npe_esfc} -ppn ${npe_node_esfc} --cpu-bind depth --depth ${NTHREADS_ESFC}"
 
     export NTHREADS_CYCLE=${nth_cycle:-14}
-    [[ $NTHREADS_CYCLE -gt $npe_node_max ]] && export NTHREADS_CYCLE=$npe_node_max
-    export APRUN_CYCLE="$launcher -n $npe_esfc -ppn $npe_node_cycle --cpu-bind depth --depth $NTHREADS_CYCLE"
+    [[ ${NTHREADS_CYCLE} -gt ${npe_node_max} ]] && export NTHREADS_CYCLE=${npe_node_max}
+    export APRUN_CYCLE="${launcher} -n ${npe_esfc} -ppn ${npe_node_cycle} --cpu-bind depth --depth ${NTHREADS_CYCLE}"
 
-elif [ $step = "epos" ]; then
+elif [[ "${step}" = "epos" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_epos))
+    nth_max=$((npe_node_max / npe_node_epos))
 
-    export NTHREADS_EPOS=${nth_epos:-$nth_max}
-    [[ $NTHREADS_EPOS -gt $nth_max ]] && export NTHREADS_EPOS=$nth_max
-    export APRUN_EPOS="$launcher -n $npe_epos -ppn $npe_node_epos --cpu-bind depth --depth $NTHREADS_EPOS"
+    export NTHREADS_EPOS=${nth_epos:-${nth_max}}
+    [[ ${NTHREADS_EPOS} -gt ${nth_max} ]] && export NTHREADS_EPOS=${nth_max}
+    export APRUN_EPOS="${launcher} -n ${npe_epos} -ppn ${npe_node_epos} --cpu-bind depth --depth ${NTHREADS_EPOS}"
 
-elif [ $step = "init" ]; then
+elif [[ "${step}" = "init" ]]; then
 
-    export APRUN="$launcher"
+    export APRUN="${launcher}"
 
-elif [ $step = "postsnd" ]; then
+elif [[ "${step}" = "postsnd" ]]; then
 
     export MPICH_MPIIO_HINTS_DISPLAY=1
     export OMP_NUM_THREADS=1
 
-    nth_max=$(($npe_node_max / $npe_node_postsnd))
+    nth_max=$((npe_node_max / npe_node_postsnd))
 
     export NTHREADS_POSTSND=${nth_postsnd:-1}
-    [[ $NTHREADS_POSTSND -gt $nth_max ]] && export NTHREADS_POSTSND=$nth_max
-    export APRUN_POSTSND="$launcher -n $npe_postsnd --depth=$NTHREADS_POSTSND --cpu-bind depth"
+    [[ ${NTHREADS_POSTSND} -gt ${nth_max} ]] && export NTHREADS_POSTSND=${nth_max}
+    export APRUN_POSTSND="${launcher} -n ${npe_postsnd} --depth=${NTHREADS_POSTSND} --cpu-bind depth"
 
     export NTHREADS_POSTSNDCFP=${nth_postsndcfp:-1}
-    [[ $NTHREADS_POSTSNDCFP -gt $nth_max ]] && export NTHREADS_POSTSNDCFP=$nth_max
-    export APRUN_POSTSNDCFP="$launcher -np $npe_postsndcfp ${mpmd_opt}"
+    [[ ${NTHREADS_POSTSNDCFP} -gt ${nth_max} ]] && export NTHREADS_POSTSNDCFP=${nth_max}
+    export APRUN_POSTSNDCFP="${launcher} -np ${npe_postsndcfp} ${mpmd_opt}"
 
-elif [ $step = "awips" ]; then
+elif [[ "${step}" = "awips" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_awips))
+    nth_max=$((npe_node_max / npe_node_awips))
 
     export NTHREADS_AWIPS=${nth_awips:-2}
-    [[ $NTHREADS_AWIPS -gt $nth_max ]] && export NTHREADS_AWIPS=$nth_max
-    export APRUN_AWIPSCFP="$launcher -np $npe_awips ${mpmd_opt}"
+    [[ ${NTHREADS_AWIPS} -gt ${nth_max} ]] && export NTHREADS_AWIPS=${nth_max}
+    export APRUN_AWIPSCFP="${launcher} -np ${npe_awips} ${mpmd_opt}"
 
-elif [ $step = "gempak" ]; then
+elif [[ "${step}" = "gempak" ]]; then
 
-    nth_max=$(($npe_node_max / $npe_node_gempak))
+    nth_max=$((npe_node_max / npe_node_gempak))
 
     export NTHREADS_GEMPAK=${nth_gempak:-1}
-    [[ $NTHREADS_GEMPAK -gt $nth_max ]] && export NTHREADS_GEMPAK=$nth_max
-    export APRUN_GEMPAKCFP="$launcher -np $npe_gempak ${mpmd_opt}"
+    [[ ${NTHREADS_GEMPAK} -gt ${nth_max} ]] && export NTHREADS_GEMPAK=${nth_max}
+    export APRUN_GEMPAKCFP="${launcher} -np ${npe_gempak} ${mpmd_opt}"
 
-elif [ $step = "waveawipsbulls" ]; then
+elif [[ "${step}" = "waveawipsbulls" ]]; then
 
     unset PERL5LIB
 
-elif [ $step = "wafsgrib2" -o $step = "wafsgrib20p25" ]; then
+elif [[ "${step}" = "wafsgrib2" ]] || [[ "${step}" = "wafsgrib20p25" ]]; then
 
     export USE_CFP=${USE_CFP:-"YES"}
 
diff --git a/env/gfs.ver b/env/gfs.ver
deleted file mode 100644
index a8f32bd289..0000000000
--- a/env/gfs.ver
+++ /dev/null
@@ -1,22 +0,0 @@
-export gfs_ver=v15.0.0
-
-export crtm_ver=2.3.0
-export hwrf_ver=v11.0.0
-export g2tmpl_ver=1.4.0
-
-export grib_util_ver=1.1.0
-export util_shared_ver=1.0.6
-export cfp_intel_sandybridge_ver=1.1.0
-export iobuf_ver=2.0.7
-export ESMF_intel_sandybridge_ver=3_1_0rp5
-export ESMF_intel_haswell_ver=3_1_0rp5
-export gempak_ver=7.3.3
-export old_gempak_ver=6.32.0
-export NCL_gnu_sandybridge_ver=6.3.0
-export ncarg_intel_sandybridge_ver=6.1.0 
-export dumpjb_ver=5.1.0
-
-## FOLLOWING are used by JGDAS_TROPC
-export obsproc_dump_ver=v4.0.0
-export obsproc_shared_bufr_dumplist_ver=v1.5.0
-