Small clean-up in formatting and typesetting