Slight rearrangement to remove repetition