Further refractoring