Fix some flake8 violations