Some code clean up for vimrc