Refactoring is done