Full implementation of Code Refactoring