Rename scenario for consistency
Rename ExpensesByCategory to ExpenseReport everywhere
Extract ExpenseReportService