Slight refac.