- Replace key value pairs with ref parameters to reduce cruft