Refactor Exercise 5