Change format, Fix potential leak