Refractoring Second Step