Email Verification Class

Cleaned up the refactoring