Style cleanup
Flake8 fixes