diff --git a/completion/available/git.completion.bash b/completion/available/git.completion.bash
index 4742a550..aa02032f 100644
--- a/completion/available/git.completion.bash
+++ b/completion/available/git.completion.bash
@@ -1,29 +1,27 @@
 #!/usr/bin/env bash
 
 # Only operate on MacOS since there are no linux paths
-if [[ $(uname) == 'Darwin' ]] ; then
+[[ "$(uname -s)" -eq 'Darwin' ]] || return
 
-  # Make sure git is installed
-  _command_exists git || return
+# Make sure git is installed
+_command_exists git || return
 
-  # Don't handle completion if it's already managed
-  ! complete -p git &>/dev/null || return
+# Don't handle completion if it's already managed
+! complete -p git &>/dev/null || return
 
-  _git_bash_completion_paths=(
-    # MacOS non-system locations
-    '/Library/Developer/CommandLineTools/usr/share/git-core/git-completion.bash'
-    '/Applications/Xcode.app/Contents/Developer/usr/share/git-core/git-completion.bash'
-  )
+_git_bash_completion_paths=(
+  # MacOS non-system locations
+  '/Library/Developer/CommandLineTools/usr/share/git-core/git-completion.bash'
+  '/Applications/Xcode.app/Contents/Developer/usr/share/git-core/git-completion.bash'
+)
 
-  for _comp_path in "${_git_bash_completion_paths[@]}" ; do
-    if [ -r "$_comp_path" ] ; then
-      source "$_comp_path"
-      unset _git_bash_completion_paths
-      return
-    fi
-  done
+for _comp_path in "${_git_bash_completion_paths[@]}" ; do
+  if [ -r "$_comp_path" ] ; then
+    source "$_comp_path"
+    unset _git_bash_completion_paths
+    return
+  fi
+done
 
-  unset _git_bash_completion_paths
-  _log_warning "no completion files found - please try enabling the 'system' completion instead."
-
-fi
+unset _git_bash_completion_paths
+_log_warning "no completion files found - please try enabling the 'system' completion instead."