Refractoring, part 4