Refractoring - Stage 1(3)