REFACTOR: more refactorings of objects (CV)