clean up

* drawing tree
* refactoring