diff --git a/.vimrc b/.vimrc
index 857d81b..b0f7b2b 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,12 +1,21 @@
-set noswapfile
-
-set expandtab
-set smarttab
-set tabstop=2
-set shiftwidth=2
-set softtabstop=0
+" Use 2-space indentation
+set tabstop=2       " Number of spaces a <Tab> counts for
+set shiftwidth=2    " Number of spaces used for autoindent
+set expandtab       " Convert <Tab> keypresses into spaces
+set autoindent      " Enable auto-indentation
+set smartindent     " Smarter indentation for code
 
+" Enable mouse support
 set mouse=a
-set number
 
-syntax on
\ No newline at end of file
+" Show line numbers
+set number
+"set relativenumber  " (Optional) show relative line numbers; remove if not wanted
+set hls
+
+" Recommended extras
+set nowrap          " Don't wrap long lines
+set clipboard=unnamedplus   " Use system clipboard
+
+" Show non-printing and whitespace characters
+set listchars=tab:▸\ ,space:·,extends:»,precedes:«,nbsp:␣,eol:¬