More refactoring of vimrc