Refactored.
Updated email verification workflow.