Finish fetching code
Refactor InitialFetcher