PEP8 and remove vestigal imports