Big cleanup of the node example