re-arrange formats a tiny bit more