Formatting fix-ups