Additional formatting tweaks