Minor refactor
Eliminate most wildcard imports and fix resulting missing imports
Unbundle Requests and urllib3; bump Requests to 2.2.1