Refactored target KPI report