More formatting improvements