Just make this a single call to format