Code formatting cleanup.

No functional changes. Just formatting.