vundles refactoring