CQS-ify, line length 120