minor flake8 tweaks, refs #349