diff --git a/neovim/neovim.conf b/neovim/neovim.conf
index 55c3ecc..c71b95e 100644
--- a/neovim/neovim.conf
+++ b/neovim/neovim.conf
@@ -1,48 +1,32 @@
-set nocompatible        " Required to read a vim (not vi) config correctly
-set completeopt=preview " Completation mode: preview
+" Global settings
+set nocompatible
+set completeopt=preview
 
-" Vim-airline settings
-let g:airline_powerline_fonts = 1
-let g:airline#extensions#tabline#enabled = 1
-let g:airline_theme='term'
-let g:airline#extensions#whitespace#enabled = 0 
-
-" Python settings
-let g:python3_host_prog = '/usr/bin/python3.9'
-let g:loaded_python_provider = 0
-
-
-" Default 4 tab spaces
 set tabstop=4
 set shiftwidth=4
 set expandtab
-" change it based on filetype
-autocmd Filetype ruby setlocal ts=2 sw=2 
-autocmd Filetype slim setlocal ts=2 sw=2
 
-" set cindent 
 set encoding=utf-8
 set nu
 set hidden   
 set noshowmode
-" Disabling backups and swap files (cause problem in servers, messy dirs etc.)
-" You might want to comment this if you are on an unstable system
 set nobackup
 set nowritebackup
 set noswapfile
 
-" Use Ctrl+Q to close buffer
+
+" Custom settings and bindings 
+autocmd Filetype ruby setlocal ts=2 sw=2 
+autocmd Filetype slim setlocal ts=2 sw=2
+filetype plugin indent on
+
 noremap <C-q> :bd<CR>
-" Map Ctrl+N for NerdTree
 map <C-n> :NERDTreeToggle<CR>
 inoremap <expr><tab> pumvisible() ? "\<c-n>" : "\<tab>"
-" Map ; to search files (fd)
 map ; :Files<CR> 
-" Map , to match in files (ripgrep)
 map ' :Rg<CR>
-" Map /ln to disable highlighting 
 nmap <leader>ln :noh<CR>
-" Windows splitting and movement (move windows with hjkl keys)
+
 function! WinMove(key)
     let t:curwin = winnr()
     exec "wincmd ".a:key
@@ -62,7 +46,7 @@ nnoremap <silent> <C-k> :call WinMove('k')<CR>
 nnoremap <silent> <C-l> :call WinMove('l')<CR>
 
 
-" Using Plug for plugins
+" Plugins
 call plug#begin('~/.vim/plugged')
 
 Plug 'preservim/nerdtree' " NerdTree for browsing directories
@@ -77,7 +61,7 @@ Plug 'airblade/vim-gitgutter' " Git plugin
 
 call plug#end()
 
-
-filetype plugin indent on
-syntax enable
-
+let g:airline_powerline_fonts = 1
+let g:airline#extensions#tabline#enabled = 1
+let g:airline_theme='term'
+let g:airline#extensions#whitespace#enabled = 0