Refactored ZIP to Address