This isn't strictly part of your changes, but we can drop the last two parameters for format here ^