Refactoring vimrc in progress