[RFC] Refactor Adjustments & Order to reduce logic