Refactored categories report