diff --git a/vimrc b/vimrc
index 61dd2a5..22691de 100644
--- a/vimrc
+++ b/vimrc
@@ -1,24 +1,23 @@
-" Anthony Perkins
-" https://git.acperkins.com/acp/vimfiles
+" Anthony Perkins https://git.acperkins.com/acp/vimfiles
 "
-" Distributed under the VIM license.  See ':help license' for a copy.
-" Files under pack/ and coc/extensions/node_modules/ have their own licenses.
+" Distributed under the VIM license.  See ':help license' for a copy. Files
+" under pack/ and coc/extensions/node_modules/ have their own licenses.
 "
 " Includes parts from Tim Pope's «sensible.vim»
 " <https://github.com/tpope/vim-sensible>.
 
-"=============================================================================
+"===============================================================================
 " Set this first to avoid overwriting later settings.
 set nocompatible
 
-"=============================================================================
+"===============================================================================
 " Load Pathogen if Vim does not support packages.
 if !has('packages')
 	runtime pack/acp/opt/vim-pathogen/autoload/pathogen.vim
 	execute pathogen#infect('pack/acp/start/{}')
 endif
 
-"=============================================================================
+"===============================================================================
 " General settings for all builds.
 
 " Set colour levels for different terminals.
@@ -47,10 +46,10 @@ nnoremap gb :bnext<CR>
 
 " Text wrapping and margin settings. Setting tw=72 is ideal for emails or
 " anything that will be read in a Terminal, while tw=100 is better for code or
-" for general text that will be viewed in a GUI. If printing, an A4-sized
-" page should fit 100 columns at 8pt or 80 columns at 10pt, in Courier or
-" Liberation Mono fonts.
-set colorcolumn=81  " Suggestions: 73, 81, 101
+" for general text that will be viewed in a GUI. If printing, an A4-sized page
+" should fit 100 columns at 8pt or 80 columns at 10pt, in Courier or Liberation
+" Mono fonts.
+set colorcolumn=73,81  " Suggestions: 73, 81, 101
 set textwidth=80  " Suggestions: 72, 80, 100
 
 " All other settings.
@@ -59,7 +58,6 @@ set autoread
 set background=dark
 set backspace=indent,eol,start
 set cmdheight=1
-set colorcolumn=73,81
 set directory=$TEMP//,/tmp//,.
 set display+=lastline
 set encoding=utf-8
@@ -95,13 +93,13 @@ set ttyfast
 set updatetime=300
 set wrap
 
-"=============================================================================
+"===============================================================================
 " General settings for non-minimal Vim builds.
 
 if has('eval')
 	" Protect commands that are only available when +eval is enabled.
-	" Technically only 'if 1' would be required, as 'has()' is provided
-	" by +eval, but this is clearer.
+	" Technically only 'if 1' would be required, as 'has()' is provided by
+	" +eval, but this is clearer.
 	command Q q
 	command W w
 	command WQ wq
@@ -127,7 +125,7 @@ if has('eval')
 	colorscheme tempus_night
 endif
 
-"=============================================================================
+"===============================================================================
 " Settings based on feature detection.
 
 if has('autocmd')
@@ -161,10 +159,6 @@ if has('gui_running')
 	set guioptions-=T
 	set guioptions-=f
 	set lines=43
-	"
-	" Set theme for GUI.
-	"set background=light
-	"colorscheme tempus_totus
 endif
 
 if has('patch-7.3.541')
@@ -227,15 +221,17 @@ endif
 
 " Customise colour schemes. Keep this near the end.
 if &background ==# 'light'
-	highlight SpecialKey ctermfg=lightgray ctermbg=NONE guifg=lightgray guibg=NONE
+	highlight SpecialKey ctermfg=lightgray ctermbg=NONE
+				\ guifg=lightgray guibg=NONE
 else
-	highlight SpecialKey ctermfg=darkgray ctermbg=NONE guifg=darkgray guibg=NONE
+	highlight SpecialKey ctermfg=darkgray ctermbg=NONE
+				\ guifg=darkgray guibg=NONE
 endif
 highlight ColorColumn ctermfg=NONE guifg=NONE
 
 " Keep this as the last config line in the file.
 runtime vimrc.local
 
-"=============================================================================
+"===============================================================================
 " End of config file.
 " vim:set ft=vim: