Replace some occurences of and_then() by map() as suggest by clippy lint clippy::bind-instead-of-map