Tidy up service's use of tasks