cleanup, goes for std:string instead of char* const