More formatting improvements.