order-report-refactoring