eliminated usage of ugly DomHelper in the core