It seems like we're trying to move towards using format, so I'm inclined to leave it as is.