DW: Corrected flake8 related errors