Refactoring.
End of the chapter 6.