Simplify control logic