BUG/STY: Fix flake8-raised issues