diff --git a/autoload/airline/extensions/vimagit.vim b/autoload/airline/extensions/vimagit.vim
index f6612f06..e91ea9fa 100644
--- a/autoload/airline/extensions/vimagit.vim
+++ b/autoload/airline/extensions/vimagit.vim
@@ -9,6 +9,8 @@ if !get(g:, 'loaded_magit', 0)
   finish
 endif
 
+let s:commit_mode = {'': 'STAGING', 'CC': 'COMMIT', 'CA': 'AMEND'}
+
 function! airline#extensions#vimagit#init(ext) abort
   call a:ext.add_statusline_func('airline#extensions#vimagit#apply')
 endfunction
@@ -17,15 +19,7 @@ function! airline#extensions#vimagit#get_mode() abort
   if ( exists("*magit#get_current_mode") )
     return magit#get_current_mode()
   else
-    if ( b:magit_current_commit_mode == '' )
-      return "STAGING"
-    elseif ( b:magit_current_commit_mode == 'CC' )
-      return "COMMIT"
-    elseif ( b:magit_current_commit_mode == 'CA' )
-      return "AMEND"
-    else
-      return "???"
-    endif
+    return get(s:commit_mode, b:magit_current_commit_mode, '???')
   endif
 endfunction