Moved categories report calculation to separate class