smal refactor sunburst