Code review for logging improvements: only made
minor formatting changes.