tidy up worker code and fix printing for task type none