Reformat (goodness what a mess)