Refactor/not so much dom

don't do some much dom action