Keep doing refactoring.