diff --git a/modules/shell/files/environment.sh b/modules/shell/files/environment.sh
index c40c8b5..ad20713 100644
--- a/modules/shell/files/environment.sh
+++ b/modules/shell/files/environment.sh
@@ -7,8 +7,5 @@ export PATH=${PATH}:${HOME}/.bin
 
 export DOTFILES=${HOME}/.dotfiles
 
-export EDITOR=$(which nano)
-export BROWSER=$(which firefox)
-
 export TIMEFMT=$'\nreal\t%E\nuser\t%U\nsys\t%S'
 export HISTCONTROL=ignoreboth
diff --git a/modules/shell/files/global-environment b/modules/shell/files/global-environment
index 6be1310..1ad33fb 100644
--- a/modules/shell/files/global-environment
+++ b/modules/shell/files/global-environment
@@ -1,9 +1,7 @@
 ANDROID_HOME=/opt/android-sdk
 QT_QPA_PLATFORMTHEME=gtk2
 GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
-
-# You may need to manually set your language environment
 LANG=en_GB.UTF-8
-
-# Compilation flags
 ARCHFLAGS="-arch x86_64"
+BROWSER=/usr/bin/firefox
+EDITOR=/usr/bin/nano