clean up naming, custom email verification.