Cleaned up the DomainClasses template.