Minor cleanup
Minor style/syntax fixes
Flatten updateTree()
Merge pull request #2 from CloCkWeRX/upstream

Flatten updateTree() slightly, minor syntax/style changes