Minor refactoring and code clean-up
Included VO -> ONE group handling