Order management - order report refactoring code