Some more formatting tweaks