Simplify control flow