Simplify checkbox logic