Refactoring part 3