svg refactor