re-arrange formats