Make conditional flow clearer