Refactor Chapter 15