diff --git a/src/main/java/avatartranslator/AvatarSyntaxChecker.java b/src/main/java/avatartranslator/AvatarSyntaxChecker.java
index e42fa0de5b31e07a06cedd88889a17934ceedd58..d9f89037ae6d3d861f1ba101e53b25f5cefb36b9 100644
--- a/src/main/java/avatartranslator/AvatarSyntaxChecker.java
+++ b/src/main/java/avatartranslator/AvatarSyntaxChecker.java
@@ -379,7 +379,7 @@ public class AvatarSyntaxChecker {
         //TraceManager.addDev("Testing guard expr=" + act);
 
         AvatarIBSExpressions.BExpr e1 = AvatarIBSolver.parseBool(act);
-        return (e1!=null?0:-1);
+        return (e1 != null ? 0 : -1);
 
 
         /*BoolExpressionEvaluator bee = new BoolExpressionEvaluator();
@@ -418,7 +418,7 @@ public class AvatarSyntaxChecker {
         }
 
         AvatarIBSExpressions.IExpr e1 = AvatarIBSolver.parseInt(act);
-        return (e1!=null?0:-1);
+        return (e1 != null ? 0 : -1);
 
         /*IntExpressionEvaluator iee = new IntExpressionEvaluator();
 
@@ -470,7 +470,7 @@ public class AvatarSyntaxChecker {
 
         AvatarIBSExpressions.BExpr e1 = AvatarIBSolver.parseBool(act);
 
-        return (e1==null?0:1);
+        return (e1 == null ? 0 : 1);
     }
 
 
@@ -508,7 +508,7 @@ public class AvatarSyntaxChecker {
         //TraceManager.addDev("3. Now with avatar expression solver:" + _expr);
 
         AvatarIBSExpressions.BExpr aee = AvatarIBSolver.parseBool(act);
-        if (aee==null) {
+        if (aee == null) {
             TraceManager.addDev("4. Error with avatar expression solver:" + act);
             return -1;
         }
diff --git a/src/main/java/avatartranslator/modelchecker/SafetyProperty.java b/src/main/java/avatartranslator/modelchecker/SafetyProperty.java
index 307ab5e06dccc531832415da2c53fb0a4fef74d2..278d8ddcb6219c707e856e4d83bca64a732706f7 100644
--- a/src/main/java/avatartranslator/modelchecker/SafetyProperty.java
+++ b/src/main/java/avatartranslator/modelchecker/SafetyProperty.java
@@ -326,7 +326,7 @@ public class SafetyProperty  {
         safetySolver = AvatarIBSolver.parseBool(_spec,p);
 
         
-        if (safetySolver==null) {
+        if (safetySolver == null) {
             errorOnProperty = BAD_PROPERTY_STRUCTURE;
             return false;
         }
@@ -376,14 +376,14 @@ public class SafetyProperty  {
         
         safetySolver = AvatarIBSolver.parseBool(_spec,pp);
 
-        if (safetySolver==null) {
+        if (safetySolver == null) {
             errorOnProperty = BAD_PROPERTY_STRUCTURE;
             return false;
         }
         
         safetySolverLead = AvatarIBSolver.parseBool(_spec,pq);
 
-        if (safetySolverLead==null) {
+        if (safetySolverLead == null) {
             errorOnProperty = BAD_PROPERTY_STRUCTURE;
             return false;
         }
@@ -419,7 +419,7 @@ public class SafetyProperty  {
         
         safetySolver = AvatarIBSolver.parseBool(block,pp);
     
-        if (safetySolver==null) {
+        if (safetySolver == null) {
             errorOnProperty = BAD_PROPERTY_STRUCTURE;
             return false;
         }
@@ -428,7 +428,7 @@ public class SafetyProperty  {
         
         safetySolverLead = AvatarIBSolver.parseBool(block,pq);
 
-        if (safetySolverLead==null) {
+        if (safetySolverLead == null) {
             errorOnProperty = BAD_PROPERTY_STRUCTURE;
             return false;
         }