Finished refactoring and improving Pie Chart stuff.