diff --git a/src/shared/Modules/ValvesViewer/ValvesList.h b/src/shared/Modules/ValvesViewer/ValvesList.h
index 0271a7a6ed3baa1514e2220a41f3c1f95115ae1a..c642949d96b94318707fa5ab8d3bbe9a00050b2b 100644
--- a/src/shared/Modules/ValvesViewer/ValvesList.h
+++ b/src/shared/Modules/ValvesViewer/ValvesList.h
@@ -34,7 +34,6 @@ enum class Valve : int
     N2O_VENTING,
     N2_FILLING,
     N2_RELEASE,
-    N2_VENTING,
     N2_DETACH,
     N2_QUENCHING,
     N2_3WAY,
@@ -46,8 +45,8 @@ enum class Valve : int
 
 // Groundstation labels
 static const QList<QString> valvesLabels{
-    "N2O FILLING", "N2O RELEASE", "N2O DETACH", "N2O VENTING",  "N2 FILLING",
-    "N2 RELEASE",  "N2 VENTING",  "N2 DETACH",  "N2 QUENCHING", "N2 3WAY",
-    "MAIN",        "NITROGEN",    "TARS",       "IGNITION"};
+    "N2O FILLING", "N2O RELEASE", "N2O DETACH",   "N2O VENTING", "N2 FILLING",
+    "N2 RELEASE",  "N2 DETACH",   "N2 QUENCHING", "N2 3WAY",     "MAIN",
+    "NITROGEN",    "TARS",        "IGNITION"};
 
 }  // namespace ValvesList
\ No newline at end of file
diff --git a/src/shared/Modules/ValvesViewer/ValvesViewer.cpp b/src/shared/Modules/ValvesViewer/ValvesViewer.cpp
index 4571e94c65603699181a04434cdb147b6bfe9411..80e52c34be3306bb07aa801fc29e0c0f70fbce50 100644
--- a/src/shared/Modules/ValvesViewer/ValvesViewer.cpp
+++ b/src/shared/Modules/ValvesViewer/ValvesViewer.cpp
@@ -21,6 +21,8 @@
 #include <Components/FilterSelector/FilterSelector.h>
 #include <Core/MessageBroker/MessageBroker.h>
 
+#include <iostream>
+
 ValvesViewer::ValvesViewer() : Module(ModuleId::VALVES_VIEWER)
 {
     setupUi();
@@ -86,8 +88,7 @@ void ValvesViewer::setFilter(const Filter& newFilter)
 {
     MessageBroker::getInstance().unsubscribe(filter, this);
     MessageBroker::getInstance().subscribe(
-        newFilter, this,
-        [this](const Message& message, const Filter& filter)
+        newFilter, this, [this](const Message& message, const Filter& filter)
         { onMsgReceived(message); });
     filter = newFilter;
 }
@@ -95,7 +96,7 @@ void ValvesViewer::setFilter(const Filter& newFilter)
 void ValvesViewer::onMsgReceived(const Message& msg)
 {
     // Couple the valves with their own state
-    QMap<ValvesList::Valve, uint64_t> map{
+    QMap<ValvesList::Valve, bool> map{
         {ValvesList::Valve::N2O_FILLING,
          msg.getField("n2o_filling_valve_state").getUnsignedInteger()},
         {ValvesList::Valve::N2O_RELEASE,
@@ -131,7 +132,7 @@ void ValvesViewer::onMsgReceived(const Message& msg)
     // Iterate over the valves to assign them the correct look
     for (auto i = map.cbegin(), end = map.cend(); i != end; i++)
     {
-        if (i.value() == 1)
+        if (i.value())
         {
             // The valve is opened
             auto label =