Refactoring week 3