Small refactor on Task, not completed yet