Simplify control structure