The last refactoring for today.