could we make the two `None`s kwargs to make it clear what we are setting to `None`?