Update to use the new format! macro