More formattign tweaks