refactor pq worker stuffs