Index: dialin/hd/alarms.py
===================================================================
diff -u -rc12f3a44ddd8ed3a8e88cebdeab8951b09428b89 -rc32591086c6d9696c63f3d282818280651cca4be
--- dialin/hd/alarms.py	(.../alarms.py)	(revision c12f3a44ddd8ed3a8e88cebdeab8951b09428b89)
+++ dialin/hd/alarms.py	(.../alarms.py)	(revision c32591086c6d9696c63f3d282818280651cca4be)
@@ -13,16 +13,15 @@
 # @date (original) 02-Apr-2020
 #
 ############################################################################
+import struct
+from logging import Logger
+
+from .constants import RESET, NO_RESET
+from ..common.msg_defs import MsgIds
 from ..protocols.CAN import (DenaliMessage,
                              DenaliChannels)
-from ..utils.conversions import integer_to_bytearray
 from ..utils.base import _AbstractSubSystem, _publish
-from ..common.msg_defs import MsgIds
-from .constants import RESET, NO_RESET
-from collections import OrderedDict
-import struct
-from logging import Logger
-from ..common.alarm_defs import AlarmList
+from ..utils.conversions import integer_to_bytearray
 
 
 class HDAlarms(_AbstractSubSystem):
Index: dialin/ui/hd_simulator.py
===================================================================
diff -u -r0e2926910624507d6b86c540b5897dde0b4b70d1 -rc32591086c6d9696c63f3d282818280651cca4be
--- dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision 0e2926910624507d6b86c540b5897dde0b4b70d1)
+++ dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision c32591086c6d9696c63f3d282818280651cca4be)
@@ -13,18 +13,19 @@
 #  @brief This class simulates the hd when interfacing with the UI
 #
 ############################################################################
+import enum
+import struct
+from time import sleep
+from typing import List
+
+from .hd_simulator_alarms import HDProxyAlarms
+from ..common.msg_defs import RequestRejectReasons, MsgIds
+from ..hd.buttons import HDButtons
 from ..protocols.CAN import (DenaliMessage,
                              DenaliCanMessenger,
                              DenaliChannels)
-from ..utils.base import _AbstractSubSystem, _LogManager, _publish
+from ..utils.base import _AbstractSubSystem, _LogManager
 from ..utils.conversions import integer_to_bytearray
-from ..hd.buttons import HDButtons
-from .hd_simulator_alarms import HDProxyAlarms
-import enum
-from typing import List
-from ..common.msg_defs import RequestRejectReasons, MsgIds
-import struct
-from time import sleep
 
 YES = 1
 NO = 0
@@ -173,7 +174,7 @@
         payload = bytearray(0x01)
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id,
-                                              message_id=HDButtons.MSG_ID_HD_POWEROFF_OPEN,
+                                              message_id=MsgIds.MSG_ID_OFF_BUTTON_PRESS,
                                               payload=payload)
 
         self.can_interface.send(message, 0)
@@ -188,7 +189,7 @@
         payload = integer_to_bytearray(1)
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id,
-                                              message_id=HDButtons.MSG_ID_HD_POWEROFF_BROADCAST,
+                                              message_id=MsgIds.MSG_ID_POWER_OFF_WARNING.value,
                                               payload=payload)
 
         self.can_interface.send(message, 0)
@@ -203,7 +204,7 @@
         payload = integer_to_bytearray(1)
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id,
-                                              message_id=HDButtons.MSG_ID_HD_POWEROFF_TIMEOUT,
+                                              message_id=MsgIds.MSG_ID_OFF_BUTTON_PRESS,
                                               payload=payload)
 
         self.can_interface.send(message, 0)
Index: dialin/utils/base.py
===================================================================
diff -u -r5dd7c5ed8c083ac0bcfb6b224f9ca9569c96a40c -rc32591086c6d9696c63f3d282818280651cca4be
--- dialin/utils/base.py	(.../base.py)	(revision 5dd7c5ed8c083ac0bcfb6b224f9ca9569c96a40c)
+++ dialin/utils/base.py	(.../base.py)	(revision c32591086c6d9696c63f3d282818280651cca4be)
@@ -13,13 +13,14 @@
 # @date (original) 22-Jun-2020
 #
 ############################################################################
-from abc import ABC, abstractmethod
-from datetime import datetime
-import os
 import logging
+import os
 import subprocess
-from enum import Enum, unique
+from abc import ABC, abstractmethod
+from datetime import datetime
+from enum import Enum
 
+
 def setup_virtual_can_interface():
     """
     Convenience function to setup a virtual can interface using the most common settings
Index: dialin/version.py
===================================================================
diff -u -rd6a96b7c76ec205fda56560bb651f1df31ef01b3 -rc32591086c6d9696c63f3d282818280651cca4be
--- dialin/version.py	(.../version.py)	(revision d6a96b7c76ec205fda56560bb651f1df31ef01b3)
+++ dialin/version.py	(.../version.py)	(revision c32591086c6d9696c63f3d282818280651cca4be)
@@ -26,7 +26,7 @@
     """
 
     try:
-        subprocess.check_output("git rev-parse --abbrev-ref HEAD", shell=True).decode("utf-8").strip()
+        return subprocess.check_output("git rev-parse --abbrev-ref HEAD", shell=True).decode("utf-8").strip()
     except subprocess.CalledProcessError:
         return None
 
Index: tools/run_static_code_analysis.sh
===================================================================
diff -u -r3e60c6828d7863221897154cae38e171e2451a3e -rc32591086c6d9696c63f3d282818280651cca4be
--- tools/run_static_code_analysis.sh	(.../run_static_code_analysis.sh)	(revision 3e60c6828d7863221897154cae38e171e2451a3e)
+++ tools/run_static_code_analysis.sh	(.../run_static_code_analysis.sh)	(revision c32591086c6d9696c63f3d282818280651cca4be)
@@ -16,4 +16,5 @@
 ############################################################################
 
 cd ../
-flake8 --ignore=E501,W293,E266,E241,E202 dialin/
\ No newline at end of file
+source venv/bin/activate
+flake8 --ignore=E501,W293,E266,E241,E202 dialin/