PEP8 fixups and import warnings add