Improve structure of .vimrc