cleaning up the activity worker a bit