Fixed Travis and Flake8 demands