String handling cleanup