Refactor svg