CPK Refactoring, code cleanup, debuging cpf-pentaho