Adjust the format call to be simpler