Refactoring pie * pieChart

Partially.