minor formatting diffs, I think