major vim refactor
more vim refactoring