diff --git a/vimrc b/vimrc
index 2a13510..d773ede 100644
--- a/vimrc
+++ b/vimrc
@@ -6,18 +6,28 @@ set number relativenumber
 " Split in the right directions
 set splitbelow splitright
 
-set incsearch ignorecase smartcase hlsearch
+" incsearch: search for string as you're typing it
+" ignorecase + smartcase: do a case-insensitive search by default, but switch
+" to case-sensitive if the search string contains capital letters
+set incsearch ignorecase smartcase nohlsearch
 
 " Create both swap & undo files
 set swapfile undofile
 
+" Update screen more often
 set updatetime=250
+
+" Center cursor in buffer
 set scrolloff=999
 
+" Set space as map key
 let mapleader = ' '
 
+" Use jk as escape
 inoremap <Esc> <nop>
 inoremap jk <Esc>
+
+" Some useful shortcuts
 nnoremap <leader>w :w<CR>
 nnoremap <leader>q :q<CR>
 
@@ -33,7 +43,7 @@ nnoremap <leader>fj :sp<CR>
 nnoremap <leader>fk :sp<CR>:wincmd k<CR>
 nnoremap <leader>fl :vsp<CR>
 
-" Resize splits
+" Resize splits using arrow keys
 nnoremap <Up> :resize +5<CR>
 nnoremap <Down> :resize -5<CR>
 nnoremap <Right> :vertical resize +5<CR>