OrderService, refactor