diff --git a/EC-GN-JA-PCF-IN/src/main/c++/GAMs/JAConditionalSignalUpdateGAM/JAConditionalSignalUpdateGAM.h b/EC-GN-JA-PCF-IN/src/main/c++/GAMs/JAConditionalSignalUpdateGAM/JAConditionalSignalUpdateGAM.h
index 021fdb0..82a2e49 100644
--- a/EC-GN-JA-PCF-IN/src/main/c++/GAMs/JAConditionalSignalUpdateGAM/JAConditionalSignalUpdateGAM.h
+++ b/EC-GN-JA-PCF-IN/src/main/c++/GAMs/JAConditionalSignalUpdateGAM/JAConditionalSignalUpdateGAM.h
@@ -126,7 +126,6 @@ private:
 
   template <class T> bool Compare(MARTe::uint32 index);
 
-
   // Input signals
   void **inputSignals;
 
@@ -160,23 +159,17 @@ template <class T>
 bool JAConditionalSignalUpdateGAM::Compare(MARTe::uint32 index) {
   switch (comparators[index].comparator) {
   case Equals:
-    return *static_cast<T *>(inputSignals[index]) ==
-           static_cast<T>(comparators[index].value);
+    return *static_cast<T *>(inputSignals[index]) == comparators[index].value;
   case Not:
-    return *static_cast<T *>(inputSignals[index]) !=
-           static_cast<T>(comparators[index].value);
+    return *static_cast<T *>(inputSignals[index]) != comparators[index].value;
   case Greater:
-    return *static_cast<T *>(inputSignals[index]) >
-           static_cast<T>(comparators[index].value);
+    return *static_cast<T *>(inputSignals[index]) > comparators[index].value;
   case EqualsOrGreater:
-    return *static_cast<T *>(inputSignals[index]) >=
-           static_cast<T>(comparators[index].value);
+    return *static_cast<T *>(inputSignals[index]) >= comparators[index].value;
   case Less:
-    return *static_cast<T *>(inputSignals[index]) <
-           static_cast<T>(comparators[index].value);
+    return *static_cast<T *>(inputSignals[index]) < comparators[index].value;
   default: // case EqualsOrLess:
-    return *static_cast<T *>(inputSignals[index]) <=
-           static_cast<T>(comparators[index].value);
+    return *static_cast<T *>(inputSignals[index]) <= comparators[index].value;
   }
 }