Refactor orderAddress