Global refactoring, part 2 (worker)