refactoring cv templates