Reformat partially, where I touched for whitespace changes.