Flake8 and style (See gs-1070)