minor refactor, node.java deleted