Order Report Refactoring