Refactor address form for company