vimrc tidy-up