Added cleanup of the string to parse.