On refactoring fetch lib.