TSUI-36, cleaned code for donut chart