* refucktoring, part 6