Logging clean up.
Fix log statements.