fix up formats