Cleaned up tasks to be consistent

* Broke out main into simple tasks.
* Restructured some tasks to multi-line for readability.  Consistent with other
tasks.