Added the address name field and cleaned up a little bit, now also use esc_attr().
Removed latest comma.