Initial refactor of CPF
2 files changed