* refucktoring, part 2