Changed fields that were public to private.
Make SVG code more compact.