add vim refactoring goodness