Refactor fetch