Revert major style changes in the rest of the file.