Refactor ExecutorWorker