changes fetcher readability, refactors fetcher spec