Finish vimrc refactor