Made several formatting tweaks