Another formatting pass