Wrap string literals per review comments,