Some cosmetic code re-formatting.