Merge "Easier to read console output"