Refractoring stage one