Simplify logic a tiny bit