Refactoring to page 190 Chapter 10)