Use TaskHelpers and clean up formatting.
Merge pull request #5 from panesofglass/master

Use TaskHelpers