Refactor into single multitask