Small logging changes
Logging changes and cleanup