Fix up the format