Question 2 refactoing