diff --git a/vimrc b/vimrc
index 7d1bf51770f9c2b290f0590a8c35da642808e5f5..722530a0bc8bc9ee1a3e489614a405fb2ffe2bd7 100644
--- a/vimrc
+++ b/vimrc
@@ -1,28 +1,15 @@
 set nocompatible
 set path+=**
-set relativenumber
-set smartcase
-set ignorecase
-set incsearch
-set hidden
-set nowrap
-set nobackup
-set noswapfile
-set autoread
-set wildmenu
-set autoindent
-set encoding=utf8
-set backspace=2
-set scrolloff=4
-set spelllang=en_us
-set laststatus=2
-set shiftwidth=4
-set tabstop=4
+set relativenumber autoindent
+set smartcase ignorecase incsearch
+set hidden nowrap nobackup noswapfile autoread
+set wildmenu laststatus=2
+set encoding=utf8 spelllang=en_us
+set backspace=2 scrolloff=4
+set shiftwidth=4 tabstop=4
 set gp=grep\ -irn
 
-filetype plugin on
-filetype indent on
-
+filetype plugin indent on
 syntax enable
 
 nnoremap <C-Right> :bnext<cr>
@@ -42,14 +29,3 @@ augroup END
 noremap <silent> gcc :<C-B>silent <C-E>s/^/<C-R>=escape(b:comment_leader,'\/')<CR>/<CR>:nohlsearch<CR>
 noremap <silent> gcu :<C-B>silent <C-E>s/^\V<C-R>=escape(b:comment_leader,'\/')<CR>//e<CR>:nohlsearch<CR>
 
-" Go autoformat.
-function! GoFmt()
-	let file = expand('%')
-	silent execute "!gofmt -w " . file
-	edit!
-endfunction
-command! GoFmt call GoFmt()
-augroup go_autocmd
-	autocmd BufWritePost *.go GoFmt
-augroup END
-