Index: README.md
===================================================================
diff -u -r3e3666a02c3b5a57feb1debcf852670e82ba33e5 -r17e48d8bf1a8960537d0615f7118bb8532e1015c
--- README.md	(.../README.md)	(revision 3e3666a02c3b5a57feb1debcf852670e82ba33e5)
+++ README.md	(.../README.md)	(revision 17e48d8bf1a8960537d0615f7118bb8532e1015c)
@@ -1,3 +1,21 @@
+<!--- 
+###########################################################################
+#
+#  Copyright (c) 2019-2019 Diality Inc. - All Rights Reserved.
+#
+#  THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+#  WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+#
+#  @file README.md
+#
+#  @date 20-July-2020
+#  @author Peter Lucia
+#
+#  @brief This README describes the Dialin API
+#
+############################################################################
+--->
+
 ![Diality](images/logo.jpg)
 # Dialin
 
Index: dialin/hd/alarms.py
===================================================================
diff -u -r7599f1d9d052276275cd79bdae626e706539044d -r17e48d8bf1a8960537d0615f7118bb8532e1015c
--- dialin/hd/alarms.py	(.../alarms.py)	(revision 7599f1d9d052276275cd79bdae626e706539044d)
+++ dialin/hd/alarms.py	(.../alarms.py)	(revision 17e48d8bf1a8960537d0615f7118bb8532e1015c)
@@ -163,7 +163,6 @@
         for attr in dir(self):
             if not callable(getattr(self, attr)) and attr.startswith("ALARM_ID"):
                 self.ids[attr] = getattr(self, attr)
-        # self.ids = sorted(self.ids, key=lambda x: x[1])
         self.ids = OrderedDict(sorted(self.ids.items(), key=lambda key: key[1]))
 
     def get_alarm_states(self):
Index: dialin/hd/hemodialysis_device.py
===================================================================
diff -u -r5d58d1eeb80237a7cafbb31bc800cb29e19615e0 -r17e48d8bf1a8960537d0615f7118bb8532e1015c
--- dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision 5d58d1eeb80237a7cafbb31bc800cb29e19615e0)
+++ dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision 17e48d8bf1a8960537d0615f7118bb8532e1015c)
@@ -183,5 +183,3 @@
         else:
             print("Timeout!!!!")
             return False
-
-
Index: dialin/hd/pressure_occlusion.py
===================================================================
diff -u -rca7f6eff65d988c19ccce8cde5efd1ef537e2095 -r17e48d8bf1a8960537d0615f7118bb8532e1015c
--- dialin/hd/pressure_occlusion.py	(.../pressure_occlusion.py)	(revision ca7f6eff65d988c19ccce8cde5efd1ef537e2095)
+++ dialin/hd/pressure_occlusion.py	(.../pressure_occlusion.py)	(revision 17e48d8bf1a8960537d0615f7118bb8532e1015c)
@@ -24,7 +24,7 @@
 
 class HDPressureOcclusion(_AbstractSubSystem):
     """
-    Hemodialysis Device (HD) Dialin API sub-class for pressure related commands.
+    Hemodialysis Delivery (HD) Dialin API sub-class for pressure related commands.
     """
 
     # Pressure/Occlusion message IDs
@@ -107,7 +107,6 @@
         """
         return self.dialysate_outlet_pump_occlusion
 
-
     @_publish([
         "arterial_pressure",
         "venous_pressure",
Index: dialin/hd/rtc.py
===================================================================
diff -u -rca7f6eff65d988c19ccce8cde5efd1ef537e2095 -r17e48d8bf1a8960537d0615f7118bb8532e1015c
--- dialin/hd/rtc.py	(.../rtc.py)	(revision ca7f6eff65d988c19ccce8cde5efd1ef537e2095)
+++ dialin/hd/rtc.py	(.../rtc.py)	(revision 17e48d8bf1a8960537d0615f7118bb8532e1015c)
@@ -23,7 +23,9 @@
 
 class HDRTC(_AbstractSubSystem):
     """
-    Hemodialysis Device (HD) Dialin API class for rtc commands.
+
+    Hemodialysis Delivery (HD) Dialin API sub-class for rtc commands.
+
     """
 
     MSG_ID_SET_RTC_DATE_TIME = 0x801D
Index: dialin/hd/treatment.py
===================================================================
diff -u -rca7f6eff65d988c19ccce8cde5efd1ef537e2095 -r17e48d8bf1a8960537d0615f7118bb8532e1015c
--- dialin/hd/treatment.py	(.../treatment.py)	(revision ca7f6eff65d988c19ccce8cde5efd1ef537e2095)
+++ dialin/hd/treatment.py	(.../treatment.py)	(revision 17e48d8bf1a8960537d0615f7118bb8532e1015c)
@@ -23,7 +23,7 @@
 class HDTreatment(_AbstractSubSystem):
     """
 
-    Hemodialysis Device (HD) Dialin API class for treatment related commands.
+    Hemodialysis Delivery (HD) Dialin API sub-class for treatment related commands.
 
     """
 
Index: dialin/hd/ui_proxy.py
===================================================================
diff -u -r5d58d1eeb80237a7cafbb31bc800cb29e19615e0 -r17e48d8bf1a8960537d0615f7118bb8532e1015c
--- dialin/hd/ui_proxy.py	(.../ui_proxy.py)	(revision 5d58d1eeb80237a7cafbb31bc800cb29e19615e0)
+++ dialin/hd/ui_proxy.py	(.../ui_proxy.py)	(revision 17e48d8bf1a8960537d0615f7118bb8532e1015c)
@@ -23,7 +23,7 @@
 
 class HDUIProxy(_AbstractSubSystem):
     """
-    Hemodialysis Device (HD) Dialin API sub-class for ui commands.
+    Hemodialysis Delivery (HD) Dialin API sub-class for ui commands.
     """
 
     # ui message IDs
Index: dialin/hd/watchdog.py
===================================================================
diff -u -rca7f6eff65d988c19ccce8cde5efd1ef537e2095 -r17e48d8bf1a8960537d0615f7118bb8532e1015c
--- dialin/hd/watchdog.py	(.../watchdog.py)	(revision ca7f6eff65d988c19ccce8cde5efd1ef537e2095)
+++ dialin/hd/watchdog.py	(.../watchdog.py)	(revision 17e48d8bf1a8960537d0615f7118bb8532e1015c)
@@ -23,7 +23,7 @@
 
 class HDWatchdog(_AbstractSubSystem):
     """
-    Hemodialysis Device (HD) Dialin API sub-class for watchdog related commands.
+    Hemodialysis Delivery (HD) Dialin API sub-class for watchdog related commands.
     """
 
     # watchdog message IDs
Index: dialin/utils/base.py
===================================================================
diff -u -rca7f6eff65d988c19ccce8cde5efd1ef537e2095 -r17e48d8bf1a8960537d0615f7118bb8532e1015c
--- dialin/utils/base.py	(.../base.py)	(revision ca7f6eff65d988c19ccce8cde5efd1ef537e2095)
+++ dialin/utils/base.py	(.../base.py)	(revision 17e48d8bf1a8960537d0615f7118bb8532e1015c)
@@ -1,3 +1,19 @@
+###########################################################################
+#
+#  Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+#
+#  THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+#  WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+#
+#  @file base.py
+#
+#  @date 20-July-2020
+#  @author P. Lucia
+#
+#  @brief Contains base classes for Dialin API sub systems and observers
+#
+#
+############################################################################
 from abc import ABC, abstractmethod
 from datetime import datetime
 
@@ -77,5 +93,3 @@
         return _wrapper
 
     return _decorator
-
-