Refactor exercise 6 week 3