Refactor vector rendering