More code clean up of logging project.