Do refactoring.