Cleaned up some code in TreeEP and JTree