diff --git a/plugins/symfony2/symfony2.plugin.zsh b/plugins/symfony2/symfony2.plugin.zsh
index cbdd9dc97..e5d0a9f6f 100644
--- a/plugins/symfony2/symfony2.plugin.zsh
+++ b/plugins/symfony2/symfony2.plugin.zsh
@@ -1,38 +1,34 @@
 # Symfony2 basic command completion
+if [[ -f app/console ]]; then
+    symfony='app/console'
+elif [[ -f bin/console ]]; then
+    symfony='bin/console'
+fi
 
 _symfony2_get_command_list () {
-	php app/console --no-ansi | sed "1,/Available commands/d" | awk '/^  [a-z]+/ { print $1 }'
+    php app/console --no-ansi | sed "1,/Available commands/d" | awk '/^  [a-z]+/ { print $1 }'
 }
 
 _symfony3_get_command_list () {
-	php bin/console --no-ansi | sed "1,/Available commands/d" | awk '/^  [a-z]+/ { print $1 }'
+    php bin/console --no-ansi | sed "1,/Available commands/d" | awk '/^  [a-z]+/ { print $1 }'
 }
 
 _symfony2 () {
-  if [ -f app/console ]; then
-    compadd `_symfony2_get_command_list`
-  elif [ -f bin/console ]; then
-    compadd `_symfony3_get_command_list`
-  fi
+    if [[ -f app/console ]]; then
+        compadd `_symfony2_get_command_list`
+    elif [[ -f bin/console ]]; then
+        compadd `_symfony3_get_command_list`
+    fi
 }
 
-_symfony_bin () {
-  if [ -f app/console ]; then
-    php app/console
-  elif [ -f bin/console ]; then
-    php bin/console
-  fi
-}
-
-compdef _symfony2 app/console
-compdef _symfony2 bin/console
+compdef _symfony2 $symfony
 compdef _symfony2 sf
 
 #Alias
-alias sf='_symfony_bin'
-alias sfcl='_symfony_bin cache:clear'
-alias sfcw='_symfony_bin cache:warmup'
-alias sfroute='_symfony_bin router:debug'
-alias sfcontainer='_symfony_bin container:debug'
-alias sfgb='_symfony_bin generate:bundle'
+alias sf=$symfony
+alias sfcl='$symfony cache:clear'
+alias sfcw='$symfony cache:warmup'
+alias sfroute='$symfony router:debug'
+alias sfcontainer='$symfony container:debug'
+alias sfgb='$symfony generate:bundle'