Finish refactoring vimrc