PO Refactoring