vjr refactoring