Merge "Logging and readability improvements"