Better debug logging output.

General code cleanup.