Refractoring Code