clean up, adjusting dom names