Cleanup refactor
Cleanup refactor
messing around with defdef and treebrowser