commenting out ldap.email_domain by default
fixing indentation and cleaning up code