Refractoring, part 5