I don't think that this needs to be `Some(map)`, you should be able to get by with just `map`