diff --git a/etc/bashrc b/etc/bashrc
index e194bba3d0..c6aa460846 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -87,8 +87,7 @@ _foamSource()
 
 
 # Add in preset user or site preferences:
-foamPrefs=`$WM_PROJECT_DIR/bin/foamEtcFile prefs.sh` && _foamSource $foamPrefs
-unset foamPrefs
+_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile prefs.sh`
 
 # Evaluate command-line parameters
 while [ $# -gt 0 ]
@@ -259,13 +258,8 @@ _foamSource $WM_PROJECT_DIR/etc/aliases.sh
 
 # Source user setup files for optional packages
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-paraview3=`$WM_PROJECT_DIR/bin/foamEtcFile apps/paraview3/bashrc` \
-    && _foamSource $paraview3
-unset paraview3
-
-ensight=`$WM_PROJECT_DIR/bin/foamEtcFile apps/ensight/bashrc` \
-    && _foamSource $ensight
-unset ensight
+_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile apps/paraview3/bashrc`
+_foamSource `$WM_PROJECT_DIR/bin/foamEtcFile apps/ensight/bashrc`
 
 
 # Clean environment paths again. Only remove duplicates
diff --git a/etc/settings.csh b/etc/settings.csh
index d1d9a413fc..8159eed539 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -37,6 +37,8 @@ alias _foamAddLib 'setenv LD_LIBRARY_PATH \!*\:${LD_LIBRARY_PATH}'
 # prefix to MANPATH
 alias _foamAddMan 'setenv MANPATH \!*\:${MANPATH}'
 
+#------------------------------------------------------------------------------
+
 # location of the jobControl directory
 setenv FOAM_JOB_DIR $WM_PROJECT_INST_DIR/jobControl
 
diff --git a/etc/settings.sh b/etc/settings.sh
index 4a1ce214c3..5b53c59f2b 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -60,6 +60,7 @@ _foamAddMan()
     done
 }
 
+#------------------------------------------------------------------------------
 
 # location of the jobControl directory
 export FOAM_JOB_DIR=$WM_PROJECT_INST_DIR/jobControl