Refractoring Code...