Refactor exercise 2 week 5