fix tree
todo cleaning