refactor address
Merge pull request #780 from jeremywrowe/refactor/elements-address

Polish up code style for the Address element