Cleaned up some 2to3 + flake