diff --git a/archlinux.vim b/archlinux.vim
index 0c6a84c..9aab1f0 100644
--- a/archlinux.vim
+++ b/archlinux.vim
@@ -1,35 +1,39 @@
-" The ArchLinux global vimrc - setting only a few sane defaults
+" The Arch Linux global vimrc - setting only a few sane defaults
 "
-" NEVER EDIT THIS FILE, IT'S OVERWRITTEN UPON UPGRADES, GLOBAL CONFIGURATION
-" SHALL BE DONE IN /etc/vimrc, USER SPECIFIC CONFIGURATION IN ~/.vimrc
+" DO NOT EDIT THIS FILE. IT'S OVERWRITTEN UPON UPGRADES.
+"
+" Use /etc/vimrc for system-wide and $HOME/.vimrc for personal configuration
+" (for details see ':help initialization').
+"
+" Use :help '<option>' to see the documentation for the given option.

-" Normally we use vim-extensions. If you want true vi-compatibility
-" remove change the following statements
-set nocompatible                " Use Vim defaults instead of 100% vi compatibility
-set backspace=indent,eol,start  " more powerful backspacing
+" Avoid side-effects when nocompatible has already been set.
+if &compatible
+  set nocompatible
+endif

-" Now we set some defaults for the editor
-set history=50                  " keep 50 lines of command line history
-set ruler                       " show the cursor position all the time
+set backspace=indent,eol,start
+set ruler
+set suffixes+=.aux,.bbl,.blg,.brf,.cb,.dvi,.idx,.ilg,.ind,.inx,.jpg,.log,.out,.png,.toc
+set suffixes-=.h
+set suffixes-=.obj

-" Suffixes that get lower priority when doing tab completion for filenames.
-" These are files we are not likely to want to edit or read.
-set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc,.png,.jpg
+" Move swap files to a secure location to protect against CVE-2017-1000382.

-" Move the swap file location to protect against CVE-2017-1000382
 if exists('$XDG_CACHE_HOME')
-	let &g:directory=$XDG_CACHE_HOME
+  let &g:directory=$XDG_CACHE_HOME
 else
-	let &g:directory=$HOME . '/.cache'
+  let &g:directory=$HOME . '/.cache'
 endif
+
 let &g:directory.='/vim/swap//'
-" Create swap directory if it doesn't exist
+
 if ! isdirectory(expand(&g:directory))
   silent! call mkdir(expand(&g:directory), 'p', 0700)
 endif

+" Make shift-insert work like in XTerm.
 if has('gui_running')
-  " Make shift-insert work like in Xterm
   map <S-Insert> <MiddleMouse>
   map! <S-Insert> <MiddleMouse>
 endif