Adding SVG support and cleaning up