Refactor Adjustments & Order to reduce logic
Merge pull request #1912 from stloyd/feature/refactor_adjustments

[RFC] Refactor Adjustments & Order to reduce logic