Reformat and minor updates