Move common email validation to its own concern module
Add minor formatting changes to models