refactoring in Terka's CV