[RFC] Refactor Adjustments & Order to reduce logic

Forgot about this, now I have removed even more code ;)