DW: Corrected flake8 issues