Reformat long line and quote around variable expansion

Quotes required for correct operation if there are spaces or some other
shell-special characters