Further formatting tweaks.