Yes, and there should be a few more hyphens, too. And judiciously used. As well as judicially, when appropriate. Semi-colons (note hyphen) are also de rigueur in finishing off numerical Unicode character aliases; or whatever they're called.

Liland