Simplify tasks

Simplifies tasks so no need for setting tasks 2x.
Merge pull request #108 from ZDroid/task

Simplify tasks