Organized some things and removed NodeState dependancy