Refactored all tasks