Refactoring: part 2