More cleanup of the format