miscellaneous updates to fetch (+PEP8)