Final formatting tweaks