Improve vimrc