general vvmoss refactoring