Some formatting tweaks