A few formatting tweaks