Refactoring problems 2 & 3