diff --git a/.zsh/functions/env b/.zsh/functions/env
new file mode 100644
index 0000000..6eb728a
--- /dev/null
+++ b/.zsh/functions/env
@@ -0,0 +1,3 @@
+# -*- mode: shell-script -*-
+
+/usr/bin/env "$@" | grep -v ^LESS_TERMCAP_
diff --git a/.zsh/functions/line b/.zsh/functions/line
new file mode 100644
index 0000000..ed70b29
--- /dev/null
+++ b/.zsh/functions/line
@@ -0,0 +1,9 @@
+# -*- mode: shell-script -*-
+
+let width=$(expr $COLUMNS - ${#1} - 2)
+
+for i in {1..$width}; do
+    echo -n \\x2d
+done
+
+echo -n " $1"
diff --git a/.zshrc b/.zshrc
index 0ec4dbd..683d8fa 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,6 +1,9 @@
 # -*- Mode: shell-script -*-
 # Setup variables
 PATH="${HOME}/bin:${PATH}:/usr/local/bin"
+INFOPATH="${HOME}/documents/info:${INFOPATH}"
+
+export INFOPATH
 
 HISTFILE=~/.zsh/histfile
 HISTSIZE=1000
@@ -16,22 +19,6 @@ zstyle :compinstall filename '/home/slash/.zshrc'
 autoload -Uz compinit
 compinit
 
-# Functions
-function env()
-{
-    exec /usr/bin/env "$@" | grep -v ^LESS_TERMCAP_
-}
-
-function line()
-{
-    let width=`expr $COLUMNS - ${#1} - 2`
-    for i in {1..$width}
-    do
-        echo -n \\x2d
-    done
-    echo " $1"
-}
-
 function shutdown()
 {
     dbus-send --system --print-reply \