Adding better handling when no arguments are passed in and to DRY the logic for setting the arguments to be saved