clean up and reorganize vimrc