fetcher clean-up
minor edits