[FIX] Last flake8 refactoring