Reformat using Tim's reformat script