RF-model: some cleaning in node class