Some minor formatting tweaks