Reformat some code, without significant changes.