Moar PEP8 + import updates