Index: leahi_dialin/dd/modules/mixing_cntrl.py
===================================================================
diff -u -rf30c7fc22184858502f33e3427e9549584c1a612 -r361386ebb5d337f441ebded3417ae87c5fecf8ed
--- leahi_dialin/dd/modules/mixing_cntrl.py	(.../mixing_cntrl.py)	(revision f30c7fc22184858502f33e3427e9549584c1a612)
+++ leahi_dialin/dd/modules/mixing_cntrl.py	(.../mixing_cntrl.py)	(revision 361386ebb5d337f441ebded3417ae87c5fecf8ed)
@@ -18,16 +18,15 @@
 from logging import Logger
 
 # Project imports
-from leahi_dialin.common.constants import NO_RESET , RESET
+from leahi_dialin.common.constants import NO_RESET
 from leahi_dialin.common.generic_defs import DataTypes
-from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
+from leahi_dialin.common.msg_defs import MsgIds
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
-from dataclasses import dataclass
 from leahi_dialin.protocols.CAN import CanMessenger, CanChannels
 from leahi_dialin.utils.abstract_classes import AbstractSubSystem
 from leahi_dialin.utils.base import publish
 from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray
-from leahi_dialin.common.closed_loop_signals import ControllerSignals
+from leahi_dialin.common.dataclass.closed_loop_signals import ControllerSignals
 
 
 class DDDialysateMixing(AbstractSubSystem):
@@ -56,8 +55,8 @@
 
         self.dd_dry_bicart_timestamp                = 0         #: The timestamp of the last message
 
-        self.dd_dry_bicart_bicarb_mix_vol          = 0.0
-        self.dd_dry_bicart_acid_mix_vol            = 0.0
+        self.dd_dry_bicart_bicarb_mix_vol           = 0.0
+        self.dd_dry_bicart_acid_mix_vol             = 0.0
 
         #TODO remove after final testing
         self.bcarb_ctlrl_signal.control_signal_reference                = 0.0