Partial implementation of Issue #348
flake8