some clean up of node practices