po response refactoring