Code cleanup, no new functionality
Fixing up the logger