* refucktoring, part 7