diff --git a/_goto b/_goto
new file mode 100644
index 0000000..1c30f14
--- /dev/null
+++ b/_goto
@@ -0,0 +1,8 @@
+function _goto {
+  for label in $(_awk '{print $1}' `_gotofile`)
+  do
+    compadd "$@" $label
+  done
+};
+
+compdef _goto goto
diff --git a/goto.plugin.zsh b/goto.plugin.zsh
index 9b1b732..7cee943 100644
--- a/goto.plugin.zsh
+++ b/goto.plugin.zsh
@@ -1,4 +1,6 @@
-#compdef _goto
+#!/usr/bin/zsh
+#
+# goto.zsh, a tool for bookmarking directories
 
 function _awk {
   which awk &>/dev/null && awk $@ || \
@@ -46,12 +48,3 @@ function goto {
     fi
   fi
 };
-
-function _goto {
-  for label in $(_awk '{print $1}' `_gotofile`)
-  do
-    compadd "$@" $label
-  done
-};
-
-compdef _goto goto