Client code refactor - Chapter 9
Api code refactor - Chapter 9