Cleanup - The aftermath

Cleaning up the mess I made (and some other stuff). Also made sure
that unsetting the email pattern, respectively validating using
`filter_var()` works properly.