Simplify logic even further