flake8 fixes... there are still some to be fixed