A better rearrangement of arguments and default values