Cleanup + refactored PPC