Some more formatting improvements.