more string cleanup