CV refactoring