diff --git a/vimrc b/vimrc
index eaf1ecc..74811e1 100644
--- a/vimrc
+++ b/vimrc
@@ -17,6 +17,75 @@ set undodir=$XDG_CACHE_HOME/vim/undo
 set undofile
 
 
+""
+"" Options
+""
+
+set spell spelllang=it                  " Spell checking...
+set nospell                             " ...only when needed
+
+set nocompatible                        " Disable vi compatibility
+set backspace=2                         " Fix DEL in the terminal
+set hidden                              " Hide buffers
+set incsearch                           " Incremental search
+set hlsearch                            " Highlight search results
+
+set ignorecase                          " Case insensitive search...
+set smartcase                           " ...for lowercase terms
+set laststatus=2                        "
+
+set mouse=a                             " Enable mouse support
+set showcmd                             " Show command while writing it
+set ruler                               " Show line/column position
+set vb t_vb=                            " Disable visual beep
+
+set nobackup                            " Disable ~backup
+set noswapfile                          " Disable swap files
+set writebackup                         " Enable temp backups
+
+set wildmenu                            " Enable cmd autocompletion
+set encoding=utf-8                      " Default encoding
+set nomodeline                          " Security
+set tabpagemax=10                       " Limit number of tabs to 10
+set showmatch                           " Highlight matched parenthesis
+set ffs=unix                            " Use UNIX file format
+set clipboard=unnamed                   " Clipboard integration
+set ttyfast                             " Improve redrawing in xterm
+filetype indent plugin on               " Identify file type
+set wildignore+=*/tmp/*,*.so,*.swp      " Files to ignore
+
+set shiftwidth=4                        " Tab
+set tabstop=4                           "
+set noexpandtab                         "
+
+set number                              " Line numbering
+set autoindent                          " Indentation
+syntax on                               " Enable syntax highlighting
+set smartindent                         "
+set noshowmode                          "
+
+
+" Barra del titolo senza “-VIM”
+set titlestring=%t%(\ %M%)%(\ (%{expand(\"%:p:h\")})%)%(\ %a%)
+
+
+""
+"" Key bindings
+""
+
+" Windows navigation
+map <C-k> <C-w><Up>
+map <C-j> <C-w><Down>
+map <C-l> <C-w><Right>
+map <C-h> <C-w><Left>
+
+map <F2> :GundoToggle<CR>
+map <F3> :call ToggleSpell()<CR>
+map <F5> :NERDTreeTabsToggle<CR>
+map <F6> :TagbarToggle<CR>
+map <D-e> :q!<CR>
+
+
 ""
 "" Plugins
 ""
@@ -38,79 +107,6 @@ Plugin 'scrooloose/syntastic'
 call vundle#end()
 
 
-""
-"" Mapping
-""
-
-" Windows navigation
-map <C-k> <C-w><Up>
-map <C-j> <C-w><Down>
-map <C-l> <C-w><Right>
-map <C-h> <C-w><Left>
-
-map <F2> :GundoToggle<CR>
-map <F3> :call ToggleSpell()<CR>
-map <F5> :NERDTreeTabsToggle<CR>
-map <F6> :TagbarToggle<CR>
-map <D-e> :q!<CR>
-
-
-""
-"" Options
-""
-
-set spell spelllang=it                  " Controllo ortografico...
-set nospell                             " ...solo quando serve
-
-set nocompatible                        " Disabilita la compatibilità con vi
-set backspace=2                         " Fix per il DEL nel terminale
-set hidden                              " Nasconde i buffers
-set history=1000                        " Aumenta la cronologia
-set incsearch                           " Ricerca incrementale
-set hlsearch                            " Evidenzia i risultati della ricerca
-
-set ignorecase                          " Ricerca case insensitive...
-set smartcase                           " ...per i termini minuscoli
-set laststatus=2                        "
-
-set mouse=a                             " Abilita il supporto al mouse
-set showcmd                             " Mostra il comando mentre lo digit
-set ruler                               " Mostra la posizione della linea/colonna
-set vb t_vb=                            " Disabilita i beep
-
-set nobackup                            " Disabilita i backup ~
-set noswapfile                          " Disabilita i file di Swap
-set writebackup                         " Abilita backup temporanei
-
-set wildmenu                            " Autocompletamento dei comandi
-set encoding=utf-8                      " Codifica
-set nomodeline                          " Sicurezza
-set tabpagemax=10                       " Limita il numero di tab a 10
-set showmatch                           " Evidenzia le parentesi selezionate
-set ffs=unix,mac                        " Formato Unix e Mac per i file
-set clipboard=unnamed                   " Integrazione con la clipboard
-set ttyfast                             " Migliora il redrawing in xterm
-filetype indent plugin on               " Riconoscimento del tipo del file
-set wildignore+=*/tmp/*,*.so,*.swp      " Altri file da ignorare
-
-set shiftwidth=4                        " Tab
-set tabstop=4                           "
-set noexpandtab                         "
-
-set number                              " Numerazione
-set autoindent                          " Indentazione
-set smartindent                         "
-set noshowmode                          "
-
-syntax on                               " Abilita il syntax-highlighter
-
-syntax enable
-hi NonText guifg=bg
-
-" Barra del titolo senza “-VIM”
-set titlestring=%t%(\ %M%)%(\ (%{expand(\"%:p:h\")})%)%(\ %a%)
-
-
 ""
 "" Plugin options
 ""