CodeRefactoring Updated