vor refactoring