Refactored email_links