Output formatting improvement