Readability improvements for 'email_address' and 'zipcode'