Donut chart: Removed some bits, tidied some bits up