PEP8 + flake cleanup before further commits