diff --git a/antigen.zsh b/antigen.zsh
index 012d1fb..5a8060a 100644
--- a/antigen.zsh
+++ b/antigen.zsh
@@ -515,22 +515,21 @@ antigen () {
     eval "test -z \"\$$arg_name\" && export $arg_name='$arg_value'"
 }
 
--antigen-env-setup
-
 # Setup antigen's autocompletion
-_antigen(){
-  compadd \
-    bundle\
-    bundles\
-    update\
-    revert\
-    list\
-    cleanup\
-    lib\
-    theme\
-    apply\
-    help
-
+_antigen () {
+    compadd \
+        bundle\
+        bundles\
+        update\
+        revert\
+        list\
+        cleanup\
+        lib\
+        theme\
+        apply\
+        help
 }
 
 compdef _antigen antigen
+
+-antigen-env-setup