[TASK] Reorder conditions according to CGL