vjr minor refactoring