string - cstruct cleanups