Make flake8 happy, mostly to restart travis build