diff --git a/autoload/gitgutter/highlight.vim b/autoload/gitgutter/highlight.vim
index dd6d56a..f180acc 100644
--- a/autoload/gitgutter/highlight.vim
+++ b/autoload/gitgutter/highlight.vim
@@ -44,11 +44,11 @@ function! gitgutter#highlight#define_signs()
 endfunction
 
 function! gitgutter#highlight#define_sign_text()
-  execute "sign define GitGutterLineAdded           text=" . g:gitgutter_sign_added
-  execute "sign define GitGutterLineModified        text=" . g:gitgutter_sign_modified
-  execute "sign define GitGutterLineRemoved         text=" . g:gitgutter_sign_removed
+  execute "sign define GitGutterLineAdded            text=" . g:gitgutter_sign_added
+  execute "sign define GitGutterLineModified         text=" . g:gitgutter_sign_modified
+  execute "sign define GitGutterLineRemoved          text=" . g:gitgutter_sign_removed
   execute "sign define GitGutterLineRemovedFirstLine text=" . g:gitgutter_sign_removed_first_line
-  execute "sign define GitGutterLineModifiedRemoved text=" . g:gitgutter_sign_modified_removed
+  execute "sign define GitGutterLineModifiedRemoved  text=" . g:gitgutter_sign_modified_removed
 endfunction
 
 function! gitgutter#highlight#define_sign_text_highlights()
@@ -57,33 +57,33 @@ function! gitgutter#highlight#define_sign_text_highlights()
   " off or disabling) we make them invisible by setting their foreground colours
   " to the background's.
   if g:gitgutter_signs
-    sign define GitGutterLineAdded           texthl=GitGutterAdd
-    sign define GitGutterLineModified        texthl=GitGutterChange
-    sign define GitGutterLineRemoved         texthl=GitGutterDelete
+    sign define GitGutterLineAdded            texthl=GitGutterAdd
+    sign define GitGutterLineModified         texthl=GitGutterChange
+    sign define GitGutterLineRemoved          texthl=GitGutterDelete
     sign define GitGutterLineRemovedFirstLine texthl=GitGutterDelete
-    sign define GitGutterLineModifiedRemoved texthl=GitGutterChangeDelete
+    sign define GitGutterLineModifiedRemoved  texthl=GitGutterChangeDelete
   else
-    sign define GitGutterLineAdded           texthl=GitGutterAddInvisible
-    sign define GitGutterLineModified        texthl=GitGutterChangeInvisible
-    sign define GitGutterLineRemoved         texthl=GitGutterDeleteInvisible
+    sign define GitGutterLineAdded            texthl=GitGutterAddInvisible
+    sign define GitGutterLineModified         texthl=GitGutterChangeInvisible
+    sign define GitGutterLineRemoved          texthl=GitGutterDeleteInvisible
     sign define GitGutterLineRemovedFirstLine texthl=GitGutterDeleteInvisible
-    sign define GitGutterLineModifiedRemoved texthl=GitGutterChangeDeleteInvisible
+    sign define GitGutterLineModifiedRemoved  texthl=GitGutterChangeDeleteInvisible
   endif
 endfunction
 
 function! gitgutter#highlight#define_sign_line_highlights()
   if g:gitgutter_highlight_lines
-    sign define GitGutterLineAdded           linehl=GitGutterAddLine
-    sign define GitGutterLineModified        linehl=GitGutterChangeLine
-    sign define GitGutterLineRemoved         linehl=GitGutterDeleteLine
+    sign define GitGutterLineAdded            linehl=GitGutterAddLine
+    sign define GitGutterLineModified         linehl=GitGutterChangeLine
+    sign define GitGutterLineRemoved          linehl=GitGutterDeleteLine
     sign define GitGutterLineRemovedFirstLine linehl=GitGutterDeleteLine
-    sign define GitGutterLineModifiedRemoved linehl=GitGutterChangeDeleteLine
+    sign define GitGutterLineModifiedRemoved  linehl=GitGutterChangeDeleteLine
   else
-    sign define GitGutterLineAdded           linehl=
-    sign define GitGutterLineModified        linehl=
-    sign define GitGutterLineRemoved         linehl=
+    sign define GitGutterLineAdded            linehl=
+    sign define GitGutterLineModified         linehl=
+    sign define GitGutterLineRemoved          linehl=
     sign define GitGutterLineRemovedFirstLine linehl=
-    sign define GitGutterLineModifiedRemoved linehl=
+    sign define GitGutterLineModifiedRemoved  linehl=
   endif
 endfunction
 
diff --git a/plugin/gitgutter.vim b/plugin/gitgutter.vim
index e559c85..526487d 100644
--- a/plugin/gitgutter.vim
+++ b/plugin/gitgutter.vim
@@ -27,21 +27,21 @@ function! s:set(var, default)
   endif
 endfunction
 
-call s:set('g:gitgutter_enabled',               1)
-call s:set('g:gitgutter_max_signs',           500)
-call s:set('g:gitgutter_signs',                 1)
-call s:set('g:gitgutter_highlight_lines',       0)
-call s:set('g:gitgutter_sign_column_always',    0)
-call s:set('g:gitgutter_realtime',              1)
-call s:set('g:gitgutter_eager',                 1)
-call s:set('g:gitgutter_sign_added',            '+')
-call s:set('g:gitgutter_sign_modified',         '~')
-call s:set('g:gitgutter_sign_removed',          '_')
-call s:set('g:gitgutter_sign_removed_first_line', '‾')
-call s:set('g:gitgutter_sign_modified_removed', '~_')
-call s:set('g:gitgutter_diff_args',             '')
-call s:set('g:gitgutter_escape_grep',           0)
-call s:set('g:gitgutter_map_keys',              1)
+call s:set('g:gitgutter_enabled',                     1)
+call s:set('g:gitgutter_max_signs',                 500)
+call s:set('g:gitgutter_signs',                       1)
+call s:set('g:gitgutter_highlight_lines',             0)
+call s:set('g:gitgutter_sign_column_always',          0)
+call s:set('g:gitgutter_realtime',                    1)
+call s:set('g:gitgutter_eager',                       1)
+call s:set('g:gitgutter_sign_added',                '+')
+call s:set('g:gitgutter_sign_modified',             '~')
+call s:set('g:gitgutter_sign_removed',              '_')
+call s:set('g:gitgutter_sign_removed_first_line',   '‾')
+call s:set('g:gitgutter_sign_modified_removed',    '~_')
+call s:set('g:gitgutter_diff_args',                  '')
+call s:set('g:gitgutter_escape_grep',                 0)
+call s:set('g:gitgutter_map_keys',                    1)
 call s:set('g:gitgutter_avoid_cmd_prompt_on_windows', 1)
 
 call gitgutter#highlight#define_sign_column_highlight()
@@ -162,14 +162,14 @@ augroup gitgutter
 
   if g:gitgutter_eager
     autocmd BufEnter,BufWritePost,FileChangedShellPost *
-          \  if gettabvar(tabpagenr(), 'gitgutter_didtabenter')
-          \|   call settabvar(tabpagenr(), 'gitgutter_didtabenter', 0)
-          \| else
-          \|   call gitgutter#process_buffer(gitgutter#utility#current_file(), 0)
-          \| endif
+          \  if gettabvar(tabpagenr(), 'gitgutter_didtabenter') |
+          \   call settabvar(tabpagenr(), 'gitgutter_didtabenter', 0) |
+          \ else |
+          \   call gitgutter#process_buffer(gitgutter#utility#current_file(), 0) |
+          \ endif
     autocmd TabEnter *
-          \  call settabvar(tabpagenr(), 'gitgutter_didtabenter', 1)
-          \| call gitgutter#all()
+          \  call settabvar(tabpagenr(), 'gitgutter_didtabenter', 1) |
+          \ call gitgutter#all()
     if !has('gui_win32')
       autocmd FocusGained * call gitgutter#all()
     endif