Output formatting improvements.