running Astyle. No functional changes.