Workers code cleanup