More formating tweaks