Refractoring step 1