Cleaning up vimrc further