Minor refractoring