dom tools tidy up (wip)