Refactoring
Chapter 6, Exercise 5
Chapter 6, Exercise 6