Please reformulate without changing whitespace. We need whitespace invariance to facilitate code review of the meaningful changes.