Refactor the email address testing code, and require a 2-letter TLD.