Fixed more flak8 errors