For #18: updated args formatting to include values