Simpified
Cleaned up worker queue implementation