Merge "Readability improvements in Logging"