Cleaner log messages
Merge