chore(tasks): refactor tasks