Some cleanup
Merge pull request #419 from Neverbirth/treeview

Some cleanup