PPNone refactoring