Reorder keyword args
Update doc