Now passes Flake8 tests