more strings cleanup