Reformat for API only