Code formatting cleanup.
Logging cleanup.