Refactor syntax unicode c string recleanup