CODE: code restructuring 2

* minor issues regarding @nodes[id] instead
  of get_node!(id)