Finished the logging refactoring.
Finished the logging refactoring.