argument formatting, cleanup