[RFC] Refactor Adjustments & Order to reduce logic

Why not using the new way (above). :)