Major refactorings in orderAddress