Some formatting refinements.