Fix a domain validation bug
Change some formatting; simplify things