Slight clean up of task service, intermediate to larger work