Client code refactor - Chapter 13