General tidying up

* Removing trailing spaces
* Removing extra commas
* Adding indentation between tasks
* Default task should always call an alias