Minor format tweaks