FLake8 cleanup