Flake8/costmetic fixes