More Refractoring