Better plugin model
cleaning up dom calls