projectKpi refactoring