flake8/PEP8 enforcement. no functional changes.