Major cleanup, use of gvimrc