Refractoring, part 1