A bit more refractoring.