small fixes from flake-8 import order and a bit of pep257