Updated channel names and cleaned up code base for nodes