Improve SVG Serialization