diff --git a/.vimrc b/.vimrc
index c3fd491..387830b 100644
--- a/.vimrc
+++ b/.vimrc
@@ -25,7 +25,7 @@ set ignorecase
 set hlsearch
 set incsearch
 
-set wrap!
+set nowrap
 
 set timeoutlen=1000
 set ttimeoutlen=0
@@ -38,35 +38,7 @@ set colorcolumn=75
 set updatetime=100
 set signcolumn=auto
 
-:nnoremap <silent> K <Nop>
-
-:vnoremap > >:normal gv<CR>
-:vnoremap < <:normal gv<CR>
-
-:vnoremap J :m '>+1<CR>gv=gv
-:vnoremap K :m '<-2<CR>gv=gv
-
-:nnoremap H :bnext<CR>zz
-:nnoremap L :bprev<CR>zz
-
-:nnoremap , :copen<CR>
-:nnoremap > :cn<CR>
-:nnoremap < :cp<CR>
-
-:nnoremap g/ :noh<CR>
-
-:nnoremap E :Ex<CR>
-
-:nnoremap <space>z :set relativenumber<CR>
-:nnoremap <space>x :set norelativenumber<CR>
-
-"xnoremap p "_dP
-
-:nnoremap gb :make<CR>
-:nnoremap gr :make run<CR>
-
-:nnoremap gw :bdelete<CR>
-
+" ----- Custom Functions --------------------------------------------------
 " Align regex
 command! -nargs=? -range Align <line1>,<line2>call AlignSection('<args>')
 vnoremap <silent> <Leader>a :Align<CR>
@@ -116,10 +88,6 @@ function! PutIntoShade()
     endif
 endfunction
 
-:nnoremap ! :1wincmd w<CR>
-:nnoremap @ :call CreateOrSelectWindow()<CR>
-:nnoremap # :call PutIntoShade()<CR>
-
 " Preserve paste line column
 function! PasteAbove()
     let c = col('.')
@@ -133,18 +101,52 @@ function! PasteBelow()
     call cursor(0, c)
 endfunction
 
-:nnoremap P :call PasteAbove()<CR>
-:nnoremap p :call PasteBelow()<CR>
+" ----- Custom Keymaps ----------------------------------------------------
+nnoremap <silent> K <Nop>
 
+vnoremap <silent> > >:normal gv<CR>
+vnoremap <silent> < <:normal gv<CR>
+
+vnoremap <silent> J :m '>+1<CR>gv=gv
+vnoremap <silent> K :m '<-2<CR>gv=gv
+
+nnoremap <silent> H :bnext<CR>zz
+nnoremap <silent> L :bprev<CR>zz
+
+nnoremap <silent> , :copen<CR>
+nnoremap <silent> > :cn<CR>
+nnoremap <silent> < :cp<CR>
+
+nnoremap <silent> g/ :noh<CR>
+
+nnoremap <silent> E :Ex<CR>
+
+nnoremap <silent> <space>z :set relativenumber!<CR>
+nnoremap <silent> <space>x :set wrap!<CR>
+
+nnoremap gb :make<CR>
+nnoremap gr :make run<CR>
+
+nnoremap <silent> gw :close<CR>
+nnoremap <silent> gq :bdelete<CR>
+
+nnoremap <silent> ! :1wincmd w<CR>
+nnoremap <silent> @ :call CreateOrSelectWindow()<CR>
+nnoremap <silent> # :call PutIntoShade()<CR>
+
+nnoremap <silent> P :call PasteAbove()<CR>
+nnoremap <silent> p :call PasteBelow()<CR>
+
+" ----- Highlights --------------------------------------------------------
 " Todo Comments highlights
 " Colors: https://vim.fandom.com/wiki/Xterm256_color_names_for_console_Vim
 " NOTE: These are confirmed to work with 'habamax' color scheme.
-:highlight TODOPerf    term=bold,underline cterm=bold,underline ctermfg=93  " purple
-:highlight TODOHack    term=bold,underline cterm=bold,underline ctermfg=214 " orange
-:highlight TODOTodo    term=bold,underline cterm=bold,underline ctermfg=51  " cyan
-:highlight TODONote    term=bold,underline cterm=bold,underline ctermfg=46  " green
-:highlight TODOFix     term=bold,underline cterm=bold,underline ctermfg=196 " green
-:highlight TODOWarning term=bold,underline cterm=bold,underline ctermfg=214 " orange
+highlight TODOPerf    term=bold,underline cterm=bold,underline ctermfg=93  " purple
+highlight TODOHack    term=bold,underline cterm=bold,underline ctermfg=214 " orange
+highlight TODOTodo    term=bold,underline cterm=bold,underline ctermfg=51  " cyan
+highlight TODONote    term=bold,underline cterm=bold,underline ctermfg=46  " green
+highlight TODOFix     term=bold,underline cterm=bold,underline ctermfg=196 " green
+highlight TODOWarning term=bold,underline cterm=bold,underline ctermfg=214 " orange
 
 augroup HiglightTODO
     autocmd!