Refactored email validator, added validators to requirements