Code Rafactoring