diff --git a/vim/.vimrc b/vim/.vimrc
index 345e934..4e8d06a 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -1,36 +1,27 @@
 "******************************************************************************
 " Settings:
-set nocompatible	" Use Vim defaults (much better!)
-set bs=indent,eol,start	" Allow backspacing over everything in insert mode
-set ai			" Always set autoindenting on
-set viminfo='20,\"50	" Read/write a .viminfo file, don't store more
-			" Than 50 lines of registers
-set history=50		" Keep 50 lines of command line history
-set ruler		" Show the cursor position all the time
-set number		" Show line numbers
-set updatetime=950	" Time to update .swp file. Used by LLP plugin
-set colorcolumn=81	" Sets coloured bar at 81 characters as a guide
-set tw=80		" Text wrapping at 80 characters
-set termguicolors 	" Set terminal colours
-set wildmenu 		" Command completion menu
-set incsearch 		" Start searching before hitting enter
-set scrolloff=1 	" Keep the lines above and below the cursor
-set ignorecase		" Ignore case when searching
-set smartcase		" Don't ignore case if search contains capitals
-set showcmd		" Show keystrokes
+set nocompatible        " Use Vim defaults (much better!)
+set bs=indent,eol,start " Allow backspacing over everything in insert mode
+set ai                  " Always set autoindenting on
+set viminfo='20,\"50    " Read/write a .viminfo file, don't store more
+                        " Than 50 lines of registers
+set history=50          " Keep 50 lines of command line history
+set ruler               " Show the cursor position all the time
+set number              " Show line numbers
+set colorcolumn=81      " Sets coloured bar at 81 characters as a guide
+set tw=80               " Text wrapping at 80 characters
+set wildmenu            " Command completion menu
+set incsearch           " Start searching before hitting enter
+set scrolloff=1         " Keep the lines above and below the cursor
+set ignorecase          " Ignore case when searching
+set smartcase           " Don't ignore case if search contains capitals
+set showcmd             " Show keystrokes
 
 filetype plugin on
 
-
 "******************************************************************************
 " Mappings:
 let mapleader = " "
 
-nnoremap <silent> <F9> :setlocal spell! spelllang=en_gb <CR>
+nnoremap <silent> <Leader>s :setlocal spell! spelllang=en_gb <CR>
 nnoremap <silent> <Esc><Esc> :noh<CR>:let @/="ldsfl2393rj0mash02enp3irnddsfc"<CR>
-nnoremap <silent> <C-n> :NERDTree <CR>
-nnoremap <silent> daa ggdG
-nnoremap <silent> zt zt2<C-Y>
-nnoremap <silent> zb zb2<C-E>
-nnoremap <silent> ciq ci"
-nnoremap <silent> <Leader>ff zfaB