Refactoring out tasks
Refactoring out tasks