refactoring cv