Refractoring First Step