clean up and improve .vimrc