Even more formatting tweaks