Client code refactor - Chapter 10