Slightly refactor HttpMasterWorker