Refractoring, part 3