Refractoring 2