Removing a C++ comment and simplifying the string handling