DRY up template with `with` block helper
Remove clean as prerequisite for default task