Cosmetic pylint fixes
Cosmetic/pylint fixes
Continue elimination of wildcard imports