uvp refactoring