Small style fixes to match latest flake8