Minor refractoring.