[FIX] Error, and some flake8