Cleaned up NodeRunStates handling