Flake8 changes: unused variables, imports