Small refactors with assigning a worker, more modular