re-fixed get_email_token, refactored file naming