vjr minor refactoring, development