Refactor: CString optimizations