refactor: getting ride of underscore in tree build