Refactoring exercise 2 & 3