Index: dialin/dg/calibration_record.py
===================================================================
diff -u -r551e0a9620126efd158e93c45e9ed84ee6ec85fb -r580b0f65e726560f7bfc7f23a1462754d66dd47f
--- dialin/dg/calibration_record.py	(.../calibration_record.py)	(revision 551e0a9620126efd158e93c45e9ed84ee6ec85fb)
+++ dialin/dg/calibration_record.py	(.../calibration_record.py)	(revision 580b0f65e726560f7bfc7f23a1462754d66dd47f)
@@ -129,7 +129,8 @@
         self.total_messages = total
         self.received_msg_length = length
         # The end of calibration_record record payload is from the start index + 12 bytes for the current message +total
-        # messages + the received_msg_length of calibration_record. The rest is the CAN messaging CRC that is not needed to be kept
+        # messages + the received_msg_length of calibration_record. The rest is the CAN messaging CRC that is not needed
+        # to be kept
         end_of_data_index = self._RECORD_START_INDEX + self._RECORD_SPECS_BYTES + self.received_msg_length
 
         # Get the calibration_record data only
Index: dialin/utils/nv_ops_utils.py
===================================================================
diff -u -r551e0a9620126efd158e93c45e9ed84ee6ec85fb -r580b0f65e726560f7bfc7f23a1462754d66dd47f
--- dialin/utils/nv_ops_utils.py	(.../nv_ops_utils.py)	(revision 551e0a9620126efd158e93c45e9ed84ee6ec85fb)
+++ dialin/utils/nv_ops_utils.py	(.../nv_ops_utils.py)	(revision 580b0f65e726560f7bfc7f23a1462754d66dd47f)
@@ -663,18 +663,7 @@
         @param data: the data to be converted to bytes in number
         @return: calculated byte size
         """
-        number_of_bytes = 0
-        # Unsigned integer = i
-        # Signed integer = I
-        # Float = f. All 4 bytes.
-        if data == '<i' or data == '<f':
-            number_of_bytes = 4
-        # Unsigned short = H. 2 bytes.
-        elif data == '<H':
-            number_of_bytes = 2
-        # Unsigned char = B. 1 byte.
-        elif data == '<B' or data == '<c':
-            number_of_bytes = 1
+        number_of_bytes = struct.calcsize(data)
 
         return number_of_bytes
 
Index: tests/test_dg_service_record.py
===================================================================
diff -u -r5fe81152c836440fe3c41308ebcc02cfbedce2cd -r580b0f65e726560f7bfc7f23a1462754d66dd47f
--- tests/test_dg_service_record.py	(.../test_dg_service_record.py)	(revision 5fe81152c836440fe3c41308ebcc02cfbedce2cd)
+++ tests/test_dg_service_record.py	(.../test_dg_service_record.py)	(revision 580b0f65e726560f7bfc7f23a1462754d66dd47f)
@@ -17,19 +17,6 @@
 
     srvc.dg_service_record['service_record']['service_date'][1] = utilities.get_current_time_in_epoch()
     print((srvc.dg_service_record))
-    #print(len(sys.dg_service_record['system_record']['top_level_pn'][1]))
 
-    #srvc.get_dg_service_record()
-
-    #while True:
-    #    sleep(0.2)
-    #    if srvc.current_message == srvc.total_messages:
-    #        break
-
-    #print(srvc.dg_service_record)
-    #print((sys.dg_service_record['system_record']['top_level_pn'][1]))
-
     srvc.set_dg_service_record()
     print(srvc.dg_service_record)
-
-    #print(cal.dg_service_record['system_record']['top_level_sn'][1])
\ No newline at end of file