Refractoring - Stage 1(4)