simplify logic in Order model