diff --git a/vim/rc/init.rc.vim b/vim/rc/init.rc.vim
index b075b98..8f95961 100644
--- a/vim/rc/init.rc.vim
+++ b/vim/rc/init.rc.vim
@@ -2,9 +2,6 @@
 filetype on
 filetype plugin indent on
 
-" Use more convenient leader
-let mapleader="\<Space>"
-
 " Enable mouse input
 set mousehide
 set mouse=a
diff --git a/vim/rc/keymap.rc.vim b/vim/rc/keymap.rc.vim
index f21e46f..1c87e23 100644
--- a/vim/rc/keymap.rc.vim
+++ b/vim/rc/keymap.rc.vim
@@ -1,3 +1,6 @@
+" Use more convenient leader
+let mapleader="\<Space>"
+
 " Remap jk to esc
 inoremap jk <esc>
 " Easy esc on TEX Yoda
@@ -48,7 +51,6 @@ cnoremap Q; q
 
 " Clearing highlighted search
 nmap <silent> <leader>/ :set hlsearch! hlsearch?<CR>
-noremap <C-h><C-s> :set hlsearch! hlsearch?<CR>
 " Clear search
 nmap <silent> <leader>cs :nohlsearch<CR>
 
@@ -61,7 +63,8 @@ vnoremap po "_dP
 
 if has('nvim')
     " make term exiting easier
-    tnoremap <c-q> <c-\><c-n>
+    tnoremap <c-W> <c-\><c-n>
+    tnoremap <c-W>. <c-W>
     tnoremap <c-\><c-\> <c-\><c-n>
 
     " Add bash related term commands