diff --git a/completions/xrandr b/completions/xrandr
index 3b89f0c1..757b6589 100644
--- a/completions/xrandr
+++ b/completions/xrandr
@@ -5,8 +5,6 @@ _xrandr()
     local cur prev words cword
     _init_completion || return
 
-    local output modes
-
     case "$prev" in
         --output|--left-of|--right-of|--above|--below|--same-as)
             local outputs=$( xrandr | awk '/connected/ {print $1}' )
@@ -14,14 +12,14 @@ _xrandr()
             return
             ;;
         --mode)
-            local i
-            for(( i = 1; i < cword; i++ )); do
+            local i output
+            for (( i=1; i < cword; i++ )); do
                 if [[ "${words[i]}" == --output ]]; then
                     output=${words[i+1]}
                     break
                 fi
             done
-            modes=$( xrandr | sed -e "1,/$output/ d" \
+            local modes=$( xrandr | sed -e "1,/$output/ d" \
                 -e "/connected/,$ d" | awk '{print $1}' )
             COMPREPLY=( $( compgen -W "$modes" -- "$cur" ) )
             return