Improve email format checkout and storage.