refactor chaos fetcher