Slight if rearangements