Flak8 cleanup