Fixed a small collection of flake8 violations that had snuck in