diff --git a/env b/env
index e11e176..11a9c73 100644
--- a/env
+++ b/env
@@ -39,26 +39,6 @@ PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin
 
 export PATH
 
-print_info -l 2 "Setting up $SYS environment"
-case $SYS in
-    darwin)
-        if [[ -d "$HOME/Library/Python/2.7/bin" ]]; then
-            export PATH="$HOME/Library/Python/2.7/bin:$PATH"
-        fi
-
-        local py27local=$HOME/Library/Python/2.7/lib/python/site-packages
-        if [[ ! -z $PYTHONPATH ]]; then
-            [[ -d $py27local ]] && PYTHONPATH=$py27local:$PYTHONPATH
-        else
-            PYTHONPATH=$py27local
-        fi
-        export PYTHONPATH
-        ;;
-    linux)
-        export MAIL="/var/mail/$USER"
-        ;;
-esac
-
 # System specific settings
 if [[ -e "$HOME/.env.$SYS" ]]; then
     print_info -l 2 "Sourcing environment setup for $SYS systems"
diff --git a/env.darwin b/env.darwin
index ec3042e..4492547 100644
--- a/env.darwin
+++ b/env.darwin
@@ -1,7 +1,20 @@
 # vim: set ft=zsh:
 # Eryn Wells <eryn@erynwells.me>
 
+[[ -d "$HOME/Library/Python/2.7/bin" ]]
+    && path=("$HOME/Library/Python/2.7/bin" $path)
 [[ -d "/usr/local/share/python3" ]] \
-   && path+=("/usr/local/share/python3")
-
+    && path+=("/usr/local/share/python3")
 export PATH
+
+
+py27local="$HOME/Library/Python/2.7/lib/python/site-packages"
+if [[ -d "$py27local" ]]; then
+    if [[ ! -z $PYTHONPATH ]]; then
+        PYTHONPATH=$py27local:$PYTHONPATH
+    else
+        PYTHONPATH=$py27local
+    fi
+fi
+unset py27local
+export PYTHONPATH
diff --git a/env.linux b/env.linux
new file mode 100644
index 0000000..99e2238
--- /dev/null
+++ b/env.linux
@@ -0,0 +1,5 @@
+# vim: set ft=zsh:
+# Linux specific environment settings
+# Eryn Wells <eryn@erynwells.me>
+
+export MAIL="/var/mail/$USER"