Refactored chapter 15 exercices