Refactor: Move the logic for when to adjust the result based on validation all...
Refactor: Move the logic for when to adjust the result based on validation all to one place, and simplify the code
Refactor: Move the logic for when to adjust the result based on validation all to one place, and simplify the code