Refactoring reporting_company