Refactor fetcher objects

:construction: