Refactored nodetool