End with refractoring