Refactor Adjustments & Order to reduce logic