Refactor fetch remote