CTMP and PV refactoring