Simplify conditional flow