Formatting and flake8 tweaks.