Done refractoring