diff --git a/nvim/init.vim b/nvim/init.vim
index e2d8cd5..23d959f 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -117,6 +117,9 @@ set linespace=0         " Set line-spacing to minimum.
 set nojoinspaces        " Prevents inserting two spaces after punctuation on a join (J)
 set splitbelow          " Horizontal split below current.
 set splitright          " Vertical split to right of current.
+set nobackup            " no backup files
+set nowritebackup       " only in case you don't want a backup file while editing
+set noswapfile          " no swap files
 
 if !&scrolloff
   set scrolloff=3       " Show next 3 lines while scrolling.
@@ -147,8 +150,10 @@ if maparg('<C-L>', 'n') ==# ''
   nnoremap <silent> <C-L> :nohlsearch<CR><C-L>
 endif
 
-"nnoremap ; :    " Use ; for commands.
-"nnoremap Q @q   " Use Q to execute default register.
+" Use ; for commands.
+nnoremap ; :
+" Use Q to execute default register.
+nnoremap Q <Nop>
 
 " Plug shortcuts
 nnoremap <Leader>pg :PlugUpgrade<CR>