Fefactoring Code