reformatting so diffs are useful