diff --git a/bash_completion b/bash_completion
index 03d89420..d294d479 100644
--- a/bash_completion
+++ b/bash_completion
@@ -533,7 +533,7 @@ _get_cword()
 _get_pword() 
 {
     if [ $COMP_CWORD -ge 1 ]; then
-        _get_cword "${@:-}" 1;
+        _get_cword "${@:-}" 1
     fi
 }
 
@@ -1618,7 +1618,7 @@ _command_offset()
         COMP_WORDS[i]=${COMP_WORDS[i+$word_offset]}
     done
     for (( i; i <= COMP_CWORD; i++ )); do
-        unset COMP_WORDS[i];
+        unset COMP_WORDS[i]
     done
     COMP_CWORD=$(( $COMP_CWORD - $word_offset ))
 
@@ -1663,9 +1663,9 @@ _command_offset()
                     fi
                 fi
             else
-                cspec=${cspec#complete};
-                cspec=${cspec%%$compcmd};
-                COMPREPLY=( $( eval compgen "$cspec" -- "$cur" ) );
+                cspec=${cspec#complete}
+                cspec=${cspec%%$compcmd}
+                COMPREPLY=( $( eval compgen "$cspec" -- "$cur" ) )
             fi
         elif [ ${#COMPREPLY[@]} -eq 0 ]; then
             _filedir
diff --git a/completions/bluez b/completions/bluez
index 960a1a14..f7abfcb5 100644
--- a/completions/bluez
+++ b/completions/bluez
@@ -37,15 +37,15 @@ _hcitool()
     case $prev in
         -i)
             _bluetooth_devices
-            return 0;
+            return 0
             ;;
         --role)
             COMPREPLY=( $( compgen -W 'm s' -- "$cur" ) )
-            return 0;
+            return 0
             ;;
         --pkt-type)
             _bluetooth_packet_types
-            return 0;
+            return 0
             ;;
     esac
 
@@ -116,7 +116,7 @@ _sdptool()
     case $prev in
         --bdaddr)
             _bluetooth_adresses
-            return 0;
+            return 0
             ;;
     esac
 
@@ -174,7 +174,7 @@ _l2ping()
     case $prev in
         -i)
             _bluetooth_devices
-            return 0;
+            return 0
             ;;
     esac
 
@@ -194,12 +194,12 @@ _rfcomm()
     case $prev in
         -f|--config)
             _filedir
-            return 0;
+            return 0
             ;;
         -i)
             _bluetooth_devices
             _bluetooth_adresses
-            return 0;
+            return 0
             ;;
     esac
 
@@ -238,7 +238,7 @@ _ciptool()
         -i)
             _bluetooth_devices
             _bluetooth_adresses
-            return 0;
+            return 0
             ;;
     esac
 
@@ -272,7 +272,7 @@ _dfutool()
     case $prev in
         -d|--device)
             _bluetooth_devices
-            return 0;
+            return 0
             ;;
     esac
 
diff --git a/completions/info b/completions/info
index ee2b7a57..58f359cf 100644
--- a/completions/info
+++ b/completions/info
@@ -59,8 +59,8 @@ _info()
     # weed out info dir file
     for (( i=0 ; i < ${#COMPREPLY[@]} ; ++i )); do
         if [ "${COMPREPLY[$i]}" == 'dir' ]; then
-            unset COMPREPLY[$i];
-        fi;
+            unset COMPREPLY[$i]
+        fi
     done
     # strip suffix from info pages
     COMPREPLY=( ${COMPREPLY[@]%.@(gz|bz2|xz|lzma)} )
diff --git a/completions/mutt b/completions/mutt
index 587f3a5e..c5d5d1f6 100644
--- a/completions/mutt
+++ b/completions/mutt
@@ -131,7 +131,7 @@ _muttfiledir()
     elif [ "$cur" == !* ]; then
         spoolfile="$( $muttcmd -F "$muttrc" -Q spoolfile | \
             sed -e 's|^spoolfile=\"\(.*\)\"$|\1|' )"
-        [ ! -z "$spoolfile" ] && eval cur="${cur/^!/$spoolfile}";
+        [ ! -z "$spoolfile" ] && eval cur="${cur/^!/$spoolfile}"
     fi
     _filedir
 
diff --git a/completions/open-iscsi b/completions/open-iscsi
index 1b45d443..6a954d86 100644
--- a/completions/open-iscsi
+++ b/completions/open-iscsi
@@ -11,19 +11,19 @@ _iscsiadm()
         -m|--mode)
             COMPREPLY=( $( compgen -W 'discovery node session iface fw host' \
                 -- "$cur" ) )
-            return 0;
+            return 0
             ;;
         -o|--op)
             COMPREPLY=( $( compgen -W 'new delete update show' -- "$cur" ) )
-            return 0;
+            return 0
             ;;
         -t|--type)
             COMPREPLY=( $( compgen -W 'sendtargets st slp isns fw' -- "$cur" ) )
-            return 0;
+            return 0
             ;;
         -L|-U|--loginall|--logoutall)
             COMPREPLY=( $( compgen -W 'all manual automatic' -- "$cur" ) )
-            return 0;
+            return 0
             ;;
     esac
 
diff --git a/completions/samba b/completions/samba
index f916bce3..4a947672 100644
--- a/completions/samba
+++ b/completions/samba
@@ -48,32 +48,32 @@ _smbclient()
     case $prev in
         -R|--name-resolve)
             _samba_resolve_order
-            return 0;
+            return 0
             ;;
         -t)
             COMPREPLY=( $( compgen -W 'SJIS EUC JIS7 JIS8 JUNET HEX CAP' \
                 -- "$cur" ) )
-            return 0;
+            return 0
             ;;
         -s|--configfile|-A|--authentication-file)
             _filedir
-            return 0;
+            return 0
             ;;
         -l|--log-basename|-D|--directory)
             _filedir -d
-            return 0;
+            return 0
             ;;
         -O|--socket-options)
             _samba_sockopts
-            return 0;
+            return 0
             ;;
         -T)
             COMPREPLY=( $( compgen -W 'c x I X F b g q r N a' -- "$cur" ) )
-            return 0;
+            return 0
             ;;
         -W|--workgroup)
             _samba_domains
-            return 0;
+            return 0
             ;;
         -d|--debuglevel)
             _samba_debuglevel
@@ -115,7 +115,7 @@ _smbget()
     case $prev in
         -o|--outputfile|-f|--rcfile)
             _filedir
-            return 0;
+            return 0
             ;;
         -d|--debuglevel)
             _samba_debuglevel
@@ -147,11 +147,11 @@ _smbcacls()
     case $prev in
         -s|--configfile|-A|--authentication-file)
             _filedir
-            return 0;
+            return 0
             ;;
         -l|--log-basename)
             _filedir -d
-            return 0;
+            return 0
             ;;
         -d|--debuglevel)
             _samba_debuglevel
@@ -192,11 +192,11 @@ _smbcquotas()
     case $prev in
         -s|--configfile|-A|--authentication-file)
             _filedir
-            return 0;
+            return 0
             ;;
         -l|--log-basename)
             _filedir -d
-            return 0;
+            return 0
             ;;
         -d|--debuglevel)
             _samba_debuglevel
@@ -228,15 +228,15 @@ _smbpasswd()
     case $prev in
         -r)
             _samba_hosts
-            return 0;
+            return 0
             ;;
         -R)
             _samba_resolve_order
-            return 0;
+            return 0
             ;;
         -c)
             _filedir
-            return 0;
+            return 0
             ;;
         -D)
             _samba_debuglevel
@@ -261,11 +261,11 @@ _smbtar()
     case $prev in
         -r|-t)
             _filedir tar
-            return 0;
+            return 0
             ;;
         -s)
             _samba_hosts
-            return 0;
+            return 0
             ;;
         -l)
             _samba_debuglevel
@@ -294,11 +294,11 @@ _smbtree()
     case $prev in
         -s|--configfile|-A|--authentication-file)
             _filedir
-            return 0;
+            return 0
             ;;
         -l|--log-basename)
             _filedir -d
-            return 0;
+            return 0
             ;;
         -d|--debuglevel)
             _samba_debuglevel
diff --git a/completions/svk b/completions/svk
index d60e1285..3aa1b322 100644
--- a/completions/svk
+++ b/completions/svk
@@ -27,12 +27,12 @@ _svk()
         case $prev in
             -F|--file|--targets)
                 _filedir
-                return 0;
+                return 0
                 ;;
             --encoding)
                 COMPREPLY=( $( compgen -W \
                     '$( iconv --list | sed -e "s@//@@;" )' -- "$cur" ) )
-                return 0;
+                return 0
                 ;;
         esac