Refactoring part 6