Trivial code cleanup
Switched to JDOMFactory for tree building