diff --git a/.bashrc b/.bashrc
index e5fd0bd..49a9ff5 100644
--- a/.bashrc
+++ b/.bashrc
@@ -11,29 +11,15 @@
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
-# Don't put duplicate lines or lines starting with space in the history.
-HISTCONTROL=ignoreboth 
-
 # If a directory is given without any command, CD into it.
 shopt -s autocd 
 
-# Some programs, such as tee(1), like to use this variable
-export LS_COLORS='di=34;40:ln=35;40:so=32;40:pi=33;40:ex=31;40:bd=34;46:cd=34;43:su=0;41:sg=0;46:tw=0;42:ow=0;43:'
-
-# Prefer vim, but if it's not installed, nano will do
-if [[ -s /usr/bin/vim ]]; then
-       	export EDITOR=vim
-else
-	export EDITOR=nano
-fi
-
 # Enable pkgfile to automatically search for packages if pkgfile is installed
 [[ -s /usr/share/doc/pkgfile/command-not-found.bash ]] && source /usr/share/doc/pkgfile/command-not-found.bash
 
 
-### UTILITIES ###
+### OTHER CONFIG ###
 
 # Source all *.sh files in ~/.bashrc.d/
-# This way all my useful little utilities are easier to reference and fix
 # shellcheck source=/dev/null
 for f in ~/.bashrc.d/*.sh; do source "$f"; done
diff --git a/.bashrc.d/11-env.sh b/.bashrc.d/11-env.sh
index 2d7ed17..ecefb3c 100644
--- a/.bashrc.d/11-env.sh
+++ b/.bashrc.d/11-env.sh
@@ -1,2 +1,15 @@
+# Don't put duplicate lines or lines starting with space in the history.
+HISTCONTROL=ignoreboth 
+
+# Prefer vim, but if it's not installed, nano will do
+if [[ -s /usr/bin/vim ]]; then
+       	export EDITOR=vim
+else
+	export EDITOR=nano
+fi
+
+# Some programs, such as tee(1), like to use this variable
+export LS_COLORS='di=34;40:ln=35;40:so=32;40:pi=33;40:ex=31;40:bd=34;46:cd=34;43:su=0;41:sg=0;46:tw=0;42:ow=0;43:'
+
 # Enable user extensions for password store
 export PASSWORD_STORE_ENABLE_EXTENSIONS="true"