And if OP is interested in improving the typography, a trivial, side-effect free improvement that’s currently missing would be to replace dashes and quotation marks by their “proper” glyphs, and using non-breaking whitespace where appropriate.