Refactoring week 4 exercises