Minor refactoring of flake8 plugin.