More cleanup using multi-line CS strings