Refactoring, part 2